diff options
| author | Zuul <zuul@review.opendev.org> | 2020-11-01 22:36:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-11-01 22:36:51 +0000 |
| commit | 619c6052aef3f0935e6b4bb9d2df5205859d895c (patch) | |
| tree | 178f1c08c33016ba086e768fbda3a827e37ddad5 | |
| parent | 708216bea68696aaf2075f3cd8c41c085216a5bf (diff) | |
| parent | 995933ff4413e5ab640d60bfe55e927613ed72c1 (diff) | |
| download | ironic-619c6052aef3f0935e6b4bb9d2df5205859d895c.tar.gz | |
Merge "Do not pass BOOTIF=None if no BOOTIF can be guessed" into stable/victoria
| -rw-r--r-- | ironic/drivers/modules/ilo/boot.py | 6 | ||||
| -rw-r--r-- | ironic/drivers/modules/irmc/boot.py | 3 | ||||
| -rw-r--r-- | ironic/drivers/modules/redfish/boot.py | 3 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/redfish/test_boot.py | 3 | ||||
| -rw-r--r-- | releasenotes/notes/no-fake-bootif-505cc5bf48e7731f.yaml | 5 |
5 files changed, 13 insertions, 7 deletions
diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py index 5ac645133..613ec40ec 100644 --- a/ironic/drivers/modules/ilo/boot.py +++ b/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: diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py index 815254843..b2bcd9c30 100644 --- a/ironic/drivers/modules/irmc/boot.py +++ b/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' diff --git a/ironic/drivers/modules/redfish/boot.py b/ironic/drivers/modules/redfish/boot.py index 576979cb3..15c8352d1 100644 --- a/ironic/drivers/modules/redfish/boot.py +++ b/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' diff --git a/ironic/tests/unit/drivers/modules/redfish/test_boot.py b/ironic/tests/unit/drivers/modules/redfish/test_boot.py index c723457b8..540b99ceb 100644 --- a/ironic/tests/unit/drivers/modules/redfish/test_boot.py +++ b/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, diff --git a/releasenotes/notes/no-fake-bootif-505cc5bf48e7731f.yaml b/releasenotes/notes/no-fake-bootif-505cc5bf48e7731f.yaml new file mode 100644 index 000000000..20944dd7f --- /dev/null +++ b/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. |