diff options
Diffstat (limited to 'ironic/drivers/modules/storage/cinder.py')
| -rw-r--r-- | ironic/drivers/modules/storage/cinder.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ironic/drivers/modules/storage/cinder.py b/ironic/drivers/modules/storage/cinder.py index e2a0a7731..d27614869 100644 --- a/ironic/drivers/modules/storage/cinder.py +++ b/ironic/drivers/modules/storage/cinder.py @@ -21,6 +21,7 @@ import retrying from ironic.common import cinder from ironic.common import exception from ironic.common.i18n import _ +from ironic.common import pxe_utils from ironic.common import states from ironic.drivers import base from ironic.drivers import utils @@ -76,13 +77,7 @@ class CinderStorage(base.StorageInterface): iscsi_uuids_found = [] wwpn_found = 0 wwnn_found = 0 - ipxe_enabled = False - if 'pxe_boot' in task.driver.boot.capabilities: - if CONF.pxe.ipxe_enabled: - ipxe_enabled = True - elif 'ipxe_boot' in task.driver.boot.capabilities: - ipxe_enabled = True - + ipxe_enabled = pxe_utils.is_ipxe_enabled(task) for connector in task.volume_connectors: if (connector.type in VALID_ISCSI_TYPES and connector.connector_id is not None): |