diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-23 04:48:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-23 04:48:48 +0000 |
| commit | 0e26dfe83902fdc84890f81d9ca06b72fae35ce5 (patch) | |
| tree | 63be32738f5120c56cd5e037572d9eaaf45e043b /ironic/conductor | |
| parent | 8f754180e849d3f22767eecd413c2297abb7303c (diff) | |
| parent | e804f6c56bbfc9c71dda9096710ad6288b5d618a (diff) | |
| download | ironic-0e26dfe83902fdc84890f81d9ca06b72fae35ce5.tar.gz | |
Merge "Account for power interfaces that cannot power on"
Diffstat (limited to 'ironic/conductor')
| -rw-r--r-- | ironic/conductor/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 88cc083b0..222ad5507 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -3669,7 +3669,8 @@ def do_sync_power_state(task, count): handle_sync_power_state_max_retries_exceeded(task, power_state) return count - if CONF.conductor.force_power_state_during_sync: + if (CONF.conductor.force_power_state_during_sync + and task.driver.power.supports_power_sync(task)): LOG.warning("During sync_power_state, node %(node)s state " "'%(actual)s' does not match expected state. " "Changing hardware state to '%(state)s'.", |