summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2011-11-08 15:30:25 +0000
committerGerrit Code Review <review@openstack.org>2011-11-08 15:30:25 +0000
commitd6f9b26ca3ff01ecef45e61e8fd473106dec3d86 (patch)
tree71c732436120a36f80a3dd6176cc7ebc4f882d84 /nova/api
parentd8165400ac5ccb61142c12af1346cf41edc31cc4 (diff)
parentd5d2df5718fae936d8c3f852be2fdc81b7789870 (diff)
downloadnova-d6f9b26ca3ff01ecef45e61e8fd473106dec3d86.tar.gz
nova-d6f9b26ca3ff01ecef45e61e8fd473106dec3d86.tar.xz
nova-d6f9b26ca3ff01ecef45e61e8fd473106dec3d86.zip
Merge "Adding task_states.REBOOTING_HARD"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/common.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 0f3f1fff7..9db50d790 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -46,6 +46,7 @@ _STATE_MAP = {
vm_states.ACTIVE: {
'default': 'ACTIVE',
task_states.REBOOTING: 'REBOOT',
+ task_states.REBOOTING_HARD: 'HARD_REBOOT',
task_states.UPDATING_PASSWORD: 'PASSWORD',
task_states.RESIZE_VERIFY: 'VERIFY_RESIZE',
},