openstack/ironic
Code Issues Proposed changes

Merge "Always reset target_power_state in node_power_action"

Browse Source
This commit is contained in:
Jenkins 2014-09-30 11:34:06 +00:00 committed by Gerrit Code Review
commit 08ea549a0d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ironic/conductor/utils.py
View File

@ -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'."),