summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-06-29 18:58:22 +0000
committerGerrit Code Review <review@openstack.org>2012-06-29 18:58:22 +0000
commit1a4cb537e402a9cfb8f2a007c4033b2da90828f6 (patch)
tree39186981d170f370cc40e999ffd8bfb92e0901ca /nova/api
parent74bd0b751500801ec0311b115d8248541db0df70 (diff)
parentf1451da5447a9af97cf6a7bbcd608195883de014 (diff)
Merge "OS API should return SHUTOFF, not STOPPED"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index 4dbfa51ff..b8e013f98 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -61,7 +61,7 @@ _STATE_MAP = {
'default': 'BUILD',
},
vm_states.STOPPED: {
- 'default': 'STOPPED',
+ 'default': 'SHUTOFF',
},
vm_states.RESIZED: {
'default': 'VERIFY_RESIZE',