diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-02-01 12:44:05 +0100 |
|---|---|---|
| committer | Dmitry Tantsur <dtantsur@protonmail.com> | 2021-02-01 13:37:20 +0100 |
| commit | a5f7d75ba2067695885c8ba92193e46fbed4d33d (patch) | |
| tree | b7c41e8665fd578ddb4b13b87ef56d4a4dfcaaf4 /ironic/drivers/modules/irmc | |
| parent | 4a7d50ce56b88c82e95665ac6df44666d3e647ed (diff) | |
| download | ironic-a5f7d75ba2067695885c8ba92193e46fbed4d33d.tar.gz | |
Apply force_persistent_boot_device to all boot interfaces
For some (likely historical) reasons we only use it for PXE and iPXE,
but the same logic applies to any boot interface (since it depends
on how the management interface and the BMC work, not on the boot
method). This change moves its handling to conductor utils.
Change-Id: I948beb4053034d3c1b4c5b7c64100e41f6022739
Diffstat (limited to 'ironic/drivers/modules/irmc')
| -rw-r--r-- | ironic/drivers/modules/irmc/boot.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ironic/drivers/modules/irmc/boot.py b/ironic/drivers/modules/irmc/boot.py index b2bcd9c30..0fcc7263f 100644 --- a/ironic/drivers/modules/irmc/boot.py +++ b/ironic/drivers/modules/irmc/boot.py @@ -41,6 +41,7 @@ from ironic.drivers.modules import deploy_utils from ironic.drivers.modules.irmc import common as irmc_common from ironic.drivers.modules.irmc import management as irmc_management from ironic.drivers.modules import pxe +from ironic.drivers import utils as driver_utils scci = importutils.try_import('scciclient.irmc.scci') @@ -83,6 +84,7 @@ OPTIONAL_PROPERTIES = { } COMMON_PROPERTIES = REQUIRED_PROPERTIES.copy() +COMMON_PROPERTIES.update(driver_utils.OPTIONAL_PROPERTIES) COMMON_PROPERTIES.update(OPTIONAL_PROPERTIES) |