diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-10-13 15:16:43 +0200 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2020-10-13 15:16:43 +0200 |
| commit | 7a89ddcf0cb3a6499cd00fc25c092147210c1fa2 (patch) | |
| tree | bac41d17df0278426e68d5c0373e781bb76a0de3 /ironic/drivers | |
| parent | d2b1387815899c31c2209bfc725dd5540cf359c0 (diff) | |
| download | ironic-7a89ddcf0cb3a6499cd00fc25c092147210c1fa2.tar.gz | |
Do not pass BOOTIF=None if no BOOTIF can be guessed
It breaks inspection with the default add_ports=pxe.
Change-Id: I730b4bbd48e7188148669670fdb742b88a62f820
Diffstat (limited to 'ironic/drivers')
| -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 |
3 files changed, 8 insertions, 4 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' |