diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-17 05:18:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-17 05:18:20 +0000 |
| commit | 6ed1d25a41ae8956ab67cddb515c6218cf8df1cd (patch) | |
| tree | 222f6580c649c7044e2ac2adc38e8e989b371e65 | |
| parent | 2616178ac24b80c3dde042bcfed9ac55d5477ba3 (diff) | |
| parent | 9a858ad4ff092e371d6a1113b03b6099eac7397e (diff) | |
| download | ironic-6ed1d25a41ae8956ab67cddb515c6218cf8df1cd.tar.gz | |
Merge "Remove detect_vendor decorator"
| -rw-r--r-- | ironic/drivers/modules/ipmitool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ironic/drivers/modules/ipmitool.py b/ironic/drivers/modules/ipmitool.py index c3b5600e3..13391ef4e 100644 --- a/ironic/drivers/modules/ipmitool.py +++ b/ironic/drivers/modules/ipmitool.py @@ -950,6 +950,7 @@ class IPMIPower(base.PowerInterface): # call to store it. vendor = task.driver.management.detect_vendor(task) if vendor: + task.upgrade_lock() props = task.node.properties props['vendor'] = vendor task.node.properties = props @@ -1241,7 +1242,6 @@ class IPMIManagement(base.ManagementInterface): response['persistent'] = 'Options apply to all future boots' in out return response - @task_manager.require_exclusive_lock @METRICS.timer('IPMIManagement.detect_vendor') def detect_vendor(self, task): """Detects, stores, and returns the hardware vendor. |