Merge branch 'master' into centos-stream

ironic-config/ironic.conf.j2

@@ -4,7 +4,7 @@ debug = true
 default_deploy_interface = direct
 default_inspect_interface = inspector
 default_network_interface = noop
-enabled_bios_interfaces = idrac-wsman,no-bios,redfish,idrac-redfish,ilo
+enabled_bios_interfaces = idrac-wsman,no-bios,redfish,idrac-redfish,irmc,ilo
 enabled_boot_interfaces = ipxe,ilo-ipxe,pxe,ilo-pxe,fake,redfish-virtual-media,idrac-redfish-virtual-media,ilo-virtual-media
 enabled_deploy_interfaces = direct,fake,ramdisk,custom-agent
 # NOTE(dtantsur): when changing this, make sure to update the driver
@@ -62,7 +62,7 @@ enable_ssl_api = true
 automated_clean = {{ env.IRONIC_AUTOMATED_CLEAN }}
 # NOTE(dtantsur): keep aligned with [pxe]boot_retry_timeout below.
 deploy_callback_timeout = 4800
-send_sensor_data = {{ env.SEND_SENSOR_DATA }} 
+send_sensor_data = {{ env.SEND_SENSOR_DATA }}
 # NOTE(TheJulia): Do not lower this value below 120 seconds.
 # Power state is checked every 60 seconds and BMC activity should
 # be avoided more often than once every sixty seconds.
@@ -107,6 +107,9 @@ insecure = {{ env.IRONIC_INSPECTOR_INSECURE }}
 # Also keep in mind that only parameters unique for inspection go here.
 # No need to duplicate pxe_append_params/kernel_append_params.
 extra_kernel_params = ipa-inspection-collectors=default,extra-hardware,logs ipa-enable-vlan-interfaces={{ env.IRONIC_INSPECTOR_VLAN_INTERFACES }} ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1
+{% if env.IRONIC_INSPECTOR_CALLBACK_ENDPOINT_OVERRIDE %}
+callback_endpoint_override = {{ env.IRONIC_INSPECTOR_CALLBACK_ENDPOINT_OVERRIDE }}
+{% endif %}
 
 [ipmi]
 # use_ipmitool_retries transfers the responsibility of retrying to ipmitool

resources/vbmc/Dockerfile

@@ -1,4 +1,6 @@
-FROM quay.io/centos/centos:stream8
+ARG BASE_IMAGE=quay.io/centos/centos:stream8
+
+FROM $BASE_IMAGE
 
 RUN dnf install -y python3 python3-requests python3-pip && \
  curl https://raw.githubusercontent.com/openstack/tripleo-repos/master/plugins/module_utils/tripleo_repos/main.py | python3 - -b master current-tripleo && \
@@ -7,4 +9,4 @@ RUN dnf install -y python3 python3-requests python3-pip && \
  dnf clean all && \
  rm -rf /var/cache/{yum,dnf}/*
 
-CMD /usr/bin/vbmcd --foreground
+CMD /usr/bin/vbmcd --foreground

scripts/configure-ironic.sh

@@ -88,6 +88,7 @@ if [ ! -z "${IRONIC_EXTERNAL_IP}" ]; then
  export IRONIC_EXTERNAL_CALLBACK_URL="http://${IRONIC_EXTERNAL_IP}:6385"
  fi
  export IRONIC_EXTERNAL_HTTP_URL="http://${IRONIC_EXTERNAL_IP}:6180"
+ export IRONIC_INSPECTOR_CALLBACK_ENDPOINT_OVERRIDE="https://${IRONIC_EXTERNAL_IP}:5050"
 fi
 
 cp /etc/ironic/ironic.conf /etc/ironic/ironic.conf_orig

scripts/runlogwatch.sh

@@ -3,21 +3,21 @@
 # Ramdisk logs path
 LOG_DIRS=("/shared/log/ironic/deploy" "/shared/log/ironic-inspector/ramdisk")
 
-for LOG_DIR in ${LOG_DIRS[@]}; do
- if [[ -d $LOG_DIR ]]; then
- while :
- do
- until ls "${LOG_DIR}"/*.tar.gz 1> /dev/null 2>&1
- do
- sleep 5
- done
+while :
+do
+ for LOG_DIR in ${LOG_DIRS[@]}; do
+ if ! ls "${LOG_DIR}"/*.tar.gz 1> /dev/null 2>&1;
+ then
+ continue
+ fi
 
- for fn in "${LOG_DIR}"/*.tar.gz
- do
- echo "************ Contents of $fn ramdisk log file bundle **************"
- tar -xOzvvf $fn | sed -e "s/^/$(basename $fn): /"
- rm -f $fn
- done
+ for fn in "${LOG_DIR}"/*.tar.gz
+ do
+ echo "************ Contents of $fn ramdisk log file bundle **************"
+ tar -xOzvvf $fn | sed -e "s/^/$(basename $fn): /"
+ rm -f $fn
  done
- fi
+ done
+
+ sleep 5
 done