diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-30 11:34:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-30 11:34:06 +0000 |
| commit | 08ea549a0d88261be2085168a68206af31f73b41 (patch) | |
| tree | cbaf6d7eb8ef5d64974914ce4285cd43fe13c89f | |
| parent | 3f2df0a2ac53a5362c1f21e4e7612988f27bb64d (diff) | |
| parent | 1ca9d5f4fba5c15b646a692e94570b2d1b67cb3a (diff) | |
| download | ironic-08ea549a0d88261be2085168a68206af31f73b41.tar.gz | |
Merge "Always reset target_power_state in node_power_action"
| -rw-r--r-- | ironic/conductor/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py index aa8b3d312..083f6bd7b 100644 --- a/ironic/conductor/utils.py +++ b/ironic/conductor/utils.py @@ -72,6 +72,7 @@ def node_power_action(task, new_state): _("Failed to change power state to '%(target)s'. " "Error: %(error)s") % { 'target': new_state, 'error': e} + node['target_power_state'] = states.NOSTATE node.save() if curr_state == new_state: @@ -85,6 +86,7 @@ def node_power_action(task, new_state): # This isn't an error, so we'll clear last_error field # (from previous operation), log a warning, and return. node['last_error'] = None + node['target_power_state'] = states.NOSTATE node.save() LOG.warn(_LW("Not going to change_node_power_state because " "current state = requested state = '%(state)s'."), |