diff --git a/containers/ironic/Dockerfile.ironic b/containers/ironic/Dockerfile.ironic index 17b8feb4f..adb67bda1 100644 --- a/containers/ironic/Dockerfile.ironic +++ b/containers/ironic/Dockerfile.ironic @@ -11,7 +11,9 @@ RUN apt-get update && \ && apt-get clean && rm -rf /var/lib/apt/lists/* COPY containers/ironic/drac-boot.patch /tmp/ +COPY containers/ironic/bios-apply-no-ipa.patch /tmp/ RUN patch -d /var/lib/openstack/lib/python3.10/site-packages -p1 < /tmp/drac-boot.patch +RUN patch -d /var/lib/openstack/lib/python3.10/site-packages -p1 < /tmp/bios-apply-no-ipa.patch COPY python/ironic-understack /tmp/ironic-understack RUN /var/lib/openstack/bin/python -m pip install --no-cache --no-cache-dir /tmp/ironic-understack sushy-oem-idrac==5.0.0 diff --git a/containers/ironic/bios-apply-no-ipa.patch b/containers/ironic/bios-apply-no-ipa.patch new file mode 100644 index 000000000..e51bdbdd5 --- /dev/null +++ b/containers/ironic/bios-apply-no-ipa.patch @@ -0,0 +1,28 @@ +diff --git a/ironic/drivers/modules/redfish/bios.py b/ironic/drivers/modules/redfish/bios.py +index 6e72f0bfd..09dc10c94 100644 +--- a/ironic/drivers/modules/redfish/bios.py ++++ b/ironic/drivers/modules/redfish/bios.py +@@ -142,8 +142,8 @@ class RedfishBIOS(base.BIOSInterface): + objects.BIOSSettingList.delete( + task.context, node_id, delete_names) + +- @base.clean_step(priority=0) +- @base.deploy_step(priority=0) ++ @base.clean_step(priority=0, requires_ramdisk=False) ++ @base.deploy_step(priority=0, requires_ramdisk=False) + @base.cache_bios_settings + def factory_reset(self, task): + """Reset the BIOS settings of the node to the factory default. +@@ -186,9 +186,9 @@ class RedfishBIOS(base.BIOSInterface): + {'node_uuid': node.uuid, 'attrs': current_attrs}) + self._clear_reboot_requested(task) + +- @base.service_step(priority=0, argsinfo=_APPLY_CONFIGURATION_ARGSINFO) +- @base.clean_step(priority=0, argsinfo=_APPLY_CONFIGURATION_ARGSINFO) +- @base.deploy_step(priority=0, argsinfo=_APPLY_CONFIGURATION_ARGSINFO) ++ @base.service_step(priority=0, argsinfo=_APPLY_CONFIGURATION_ARGSINFO, requires_ramdisk=False) ++ @base.clean_step(priority=0, argsinfo=_APPLY_CONFIGURATION_ARGSINFO, requires_ramdisk=False) ++ @base.deploy_step(priority=0, argsinfo=_APPLY_CONFIGURATION_ARGSINFO, requires_ramdisk=False) + @base.cache_bios_settings + def apply_configuration(self, task, settings): + """Apply the BIOS settings to the node.