summaryrefslogtreecommitdiff
path: root/ironic/drivers/modules/ilo/boot.py
diff options
context:
space:
mode:
authorHironori Shiina <shiina.hironori@jp.fujitsu.com>2018-10-14 22:13:47 +0900
committerHironori Shiina <shiina.hironori@jp.fujitsu.com>2018-11-03 23:46:12 +0900
commit60767aee611bb46cf4b3fd1639224f817551bfb9 (patch)
tree22a166b891c3fe183a2440641eae7cadfc1d944b /ironic/drivers/modules/ilo/boot.py
parent82190ae484082e46a1011150b2ec3d2d0a5ecd67 (diff)
downloadironic-60767aee611bb46cf4b3fd1639224f817551bfb9.tar.gz
Recommend to set boot mode explicitly
A future release will change the default boot mode from legacy BIOS to UEFI. The default boot mode can be set to [deploy]/default_boot_mode option for hardware types which support setting boot mode. Otherwise, the default boot mode is hard-coded as legacy BIOS. This patch recommends to set boot mode explicitly in a help message of [deploy]/default_boot_mode option. A warning message is also logged when a default hard-coded boot mode is used. This message is logged once even if there are multiple nodes whose boot modes are configured explicitly for not emitting too many messages. Change-Id: Ib90ebf59ba72d49cb757e44f3741b5373a411ddf Story: 2003936 Task: 27475
Diffstat (limited to 'ironic/drivers/modules/ilo/boot.py')
-rw-r--r--ironic/drivers/modules/ilo/boot.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic/drivers/modules/ilo/boot.py b/ironic/drivers/modules/ilo/boot.py
index 804e6772c..670c65d95 100644
--- a/ironic/drivers/modules/ilo/boot.py
+++ b/ironic/drivers/modules/ilo/boot.py
@@ -185,7 +185,7 @@ def _get_boot_iso(task, root_uuid):
# Option 3 - Create boot_iso from kernel/ramdisk, upload to Swift
# or web server and provide its name.
deploy_iso_uuid = deploy_info['ilo_deploy_iso']
- boot_mode = boot_mode_utils.get_boot_mode_for_deploy(task.node)
+ boot_mode = boot_mode_utils.get_boot_mode(task.node)
boot_iso_object_name = _get_boot_iso_object_name(task.node)
kernel_params = ""
if deploy_utils.get_boot_option(task.node) == "ramdisk":
@@ -525,7 +525,7 @@ class IloVirtualMediaBoot(base.BootInterface):
"""
ilo_common.cleanup_vmedia_boot(task)
- boot_mode = boot_mode_utils.get_boot_mode_for_deploy(task.node)
+ boot_mode = boot_mode_utils.get_boot_mode(task.node)
boot_option = deploy_utils.get_boot_option(task.node)
if deploy_utils.is_iscsi_boot(task):
@@ -700,7 +700,7 @@ class IloPXEBoot(pxe.PXEBoot):
# Need to enable secure boot, if being requested
ilo_common.update_secure_boot_mode(task, True)
- boot_mode = boot_mode_utils.get_boot_mode_for_deploy(task.node)
+ boot_mode = boot_mode_utils.get_boot_mode(task.node)
if deploy_utils.is_iscsi_boot(task) and boot_mode == 'uefi':
# Need to set 'ilo_uefi_iscsi_boot' param for clean up