diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-10 15:44:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-10 15:44:34 +0000 |
| commit | 3d8626dc10fb69809f81839abae439ebb612194c (patch) | |
| tree | 920fedb6641608c8fde9b99cd067405a5aae72f7 /ironic/drivers/modules/pxe.py | |
| parent | cffe41c238555bef5d2f9836a4145392754f17be (diff) | |
| parent | 049fd407196c0eb5846f5ff63f2cbc482afa4d89 (diff) | |
| download | ironic-3d8626dc10fb69809f81839abae439ebb612194c.tar.gz | |
Merge "Add a flag to always perform persistent boot on PXE interface"
Diffstat (limited to 'ironic/drivers/modules/pxe.py')
| -rw-r--r-- | ironic/drivers/modules/pxe.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ironic/drivers/modules/pxe.py b/ironic/drivers/modules/pxe.py index 8101f6295..ea0be690f 100644 --- a/ironic/drivers/modules/pxe.py +++ b/ironic/drivers/modules/pxe.py @@ -21,6 +21,7 @@ from ironic_lib import metrics_utils from ironic_lib import utils as ironic_utils from oslo_log import log as logging from oslo_utils import fileutils +from oslo_utils import strutils from ironic.common import boot_devices from ironic.common import dhcp_factory @@ -484,8 +485,11 @@ class PXEBoot(base.BootInterface): pxe_utils.create_pxe_config(task, pxe_options, pxe_config_template) + persistent = strutils.bool_from_string( + node.driver_info.get('force_persistent_boot_device', + False)) manager_utils.node_set_boot_device(task, boot_devices.PXE, - persistent=False) + persistent=persistent) if CONF.pxe.ipxe_enabled and CONF.pxe.ipxe_use_swift: pxe_info.pop('deploy_kernel', None) |