summaryrefslogtreecommitdiff
path: root/ironic/conductor/utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'ironic/conductor/utils.py')
-rw-r--r--ironic/conductor/utils.py20
1 files changed, 4 insertions, 16 deletions
diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py
index e8189e4ea..fe771189d 100644
--- a/ironic/conductor/utils.py
+++ b/ironic/conductor/utils.py
@@ -34,23 +34,11 @@ def node_set_boot_device(task, device, persistent=False):
ManagementInterface fails.
"""
- try:
- # TODO(lucasagomes): Remove this conditional once all drivers
- # are ported to use the management interface
- if getattr(task.driver, 'management', None):
- task.driver.management.validate(task)
- task.driver.management.set_boot_device(task,
- device=device,
- persistent=persistent)
- else:
- task.driver.vendor.vendor_passthru(task,
+ if getattr(task.driver, 'management', None):
+ task.driver.management.validate(task)
+ task.driver.management.set_boot_device(task,
device=device,
- persistent=persistent,
- method='set_boot_device')
- except exception.UnsupportedDriverExtension:
- # NOTE(deva): Some drivers, like SSH, do not support set_boot_device.
- # This is not a fatal exception.
- pass
+ persistent=persistent)
@task_manager.require_exclusive_lock