diff options
| author | Ilya Etingof <etingof@gmail.com> | 2018-05-18 11:50:15 +0200 |
|---|---|---|
| committer | Ilya Etingof <etingof@gmail.com> | 2018-06-20 11:37:11 +0200 |
| commit | e3d66818fac8608a00629eb9b1c17e95aab4496d (patch) | |
| tree | 8d99e486837f9da487e6dc16e3fcaed7b8933f1d /ironic/drivers/modules/pxe.py | |
| parent | fbc74b792484ec3f99c56be2a020700e23469a43 (diff) | |
| download | ironic-e3d66818fac8608a00629eb9b1c17e95aab4496d.tar.gz | |
Move boot-related code to boot_mode_utils.py
This change collects boot-relalated functions into
the `boot_mode_utils.py` module to improve code clarity.
Change-Id: I1a2225d503deb382ba6021a6073c81cd03ca3175
Story: 1734131
Task: 10640
Diffstat (limited to 'ironic/drivers/modules/pxe.py')
| -rw-r--r-- | ironic/drivers/modules/pxe.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index f2310c64e..6dc947882 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -281,7 +281,7 @@ def _build_service_pxe_config(task, instance_image_info, iwdi = node.driver_internal_info.get('is_whole_disk_image') deploy_utils.switch_pxe_config( pxe_config_path, root_uuid_or_disk_id, - deploy_utils.get_boot_mode_for_deploy(node), + boot_mode_utils.get_boot_mode_for_deploy(node), iwdi, deploy_utils.is_trusted_boot_requested(node), deploy_utils.is_iscsi_boot(task)) @@ -354,7 +354,7 @@ def _get_volume_pxe_options(task): def validate_boot_parameters_for_trusted_boot(node): """Check if boot parameters are valid for trusted boot.""" - boot_mode = deploy_utils.get_boot_mode_for_deploy(node) + boot_mode = boot_mode_utils.get_boot_mode_for_deploy(node) boot_option = deploy_utils.get_boot_option(node) is_whole_disk_image = node.driver_internal_info.get('is_whole_disk_image') # 'is_whole_disk_image' is not supported by trusted boot, because there is @@ -614,7 +614,7 @@ class PXEBoot(base.BootInterface): task, pxe_options, pxe_config_template) deploy_utils.switch_pxe_config( pxe_config_path, None, - deploy_utils.get_boot_mode_for_deploy(node), False, + boot_mode_utils.get_boot_mode_for_deploy(node), False, iscsi_boot=True) boot_device = boot_devices.PXE |