openstack/ironic
Code Issues Proposed changes

Merge "Fix bypassed reference to node state values"

Browse Source
This commit is contained in:
Jenkins 2014-04-28 15:10:25 +00:00 committed by Gerrit Code Review
commit fe13f3c13f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/nova/virt/ironic/driver.py
View File

@ -376,7 +376,8 @@ class IronicDriver(virt_driver.ComputeDriver):
# trigger the node deploy # trigger the node deploy
try: try:
icli.call("node.set_provision_state", node_uuid, 'active') icli.call("node.set_provision_state", node_uuid,
ironic_states.ACTIVE)
except (exception.NovaException, # Retry failed except (exception.NovaException, # Retry failed
ironic_exception.HTTPInternalServerError, # Validations ironic_exception.HTTPInternalServerError, # Validations
ironic_exception.HTTPBadRequest) as e: # Maintenance ironic_exception.HTTPBadRequest) as e: # Maintenance