Merge "Do not pass BOOTIF=None if no BOOTIF can be guessed" into stable/victoria

ironic/drivers/modules/ilo/boot.py

@@ -456,7 +456,8 @@ class IloVirtualMediaBoot(base.BootInterface):
         task.node.save()
 
         deploy_nic_mac = deploy_utils.get_single_nic_with_vif_port_id(task)
-        ramdisk_params['BOOTIF'] = deploy_nic_mac
+        if deploy_nic_mac is not None:
+            ramdisk_params['BOOTIF'] = deploy_nic_mac
         if (node.driver_info.get('ilo_rescue_iso')
                 and node.provision_state == states.RESCUING):
             iso = node.driver_info['ilo_rescue_iso']
@@ -1077,7 +1078,8 @@ class IloUefiHttpsBoot(base.BootInterface):
         task.node.save()
 
         deploy_nic_mac = deploy_utils.get_single_nic_with_vif_port_id(task)
-        ramdisk_params['BOOTIF'] = deploy_nic_mac
+        if deploy_nic_mac is not None:
+            ramdisk_params['BOOTIF'] = deploy_nic_mac
 
         mode = 'deploy'
         if node.provision_state == states.RESCUING:

ironic/drivers/modules/irmc/boot.py

@@ -994,7 +994,8 @@ class IRMCVirtualMediaBoot(base.BootInterface, IRMCVolumeBootMixIn):
         task.node.save()
 
         deploy_nic_mac = deploy_utils.get_single_nic_with_vif_port_id(task)
-        ramdisk_params['BOOTIF'] = deploy_nic_mac
+        if deploy_nic_mac is not None:
+            ramdisk_params['BOOTIF'] = deploy_nic_mac
 
         if task.node.provision_state == states.RESCUING:
             mode = 'rescue'

ironic/drivers/modules/redfish/boot.py

@@ -415,7 +415,8 @@ class RedfishVirtualMediaBoot(base.BootInterface):
         config_via_floppy = d_info.get('config_via_floppy')
 
         deploy_nic_mac = deploy_utils.get_single_nic_with_vif_port_id(task)
-        ramdisk_params['BOOTIF'] = deploy_nic_mac
+        if deploy_nic_mac is not None:
+            ramdisk_params['BOOTIF'] = deploy_nic_mac
         if CONF.debug and 'ipa-debug' not in ramdisk_params:
             ramdisk_params['ipa-debug'] = '1'
 

ironic/tests/unit/drivers/modules/redfish/test_boot.py

@@ -356,7 +356,6 @@ class RedfishVirtualMediaBootTestCase(db_base.DbTestCase):
                 task, 'image-url', sushy.VIRTUAL_MEDIA_CD)
 
             expected_params = {
-                'BOOTIF': None,
                 'ipa-agent-token': mock.ANY,
                 'ipa-debug': '1',
             }
@@ -402,7 +401,6 @@ class RedfishVirtualMediaBootTestCase(db_base.DbTestCase):
                 task, 'image-url', sushy.VIRTUAL_MEDIA_CD)
 
             expected_params = {
-                'BOOTIF': None,
                 'ipa-agent-token': mock.ANY,
             }
 
@@ -470,7 +468,6 @@ class RedfishVirtualMediaBootTestCase(db_base.DbTestCase):
             mock__insert_vmedia.assert_has_calls(insert_calls)
 
             expected_params = {
-                'BOOTIF': None,
                 'boot_method': 'vmedia',
                 'ipa-debug': '1',
                 'ipa-agent-token': mock.ANY,

releasenotes/notes/no-fake-bootif-505cc5bf48e7731f.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    No longer tries to pass ``BOOTIF=None`` as a kernel parameter when using
+    virtual media. This could break inspection.