summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2012-06-28 20:56:13 +0000
committerChris Behrens <cbehrens@codestud.com>2012-06-28 20:56:13 +0000
commitf1451da5447a9af97cf6a7bbcd608195883de014 (patch)
treebf20156b52c1b86df504d8e1a6bd14a7a764171a /nova/api
parent96d5c1ef8ce3c9525acbf3a00fc609f65c1e7d4c (diff)
downloadnova-f1451da5447a9af97cf6a7bbcd608195883de014.tar.gz
nova-f1451da5447a9af97cf6a7bbcd608195883de014.tar.xz
nova-f1451da5447a9af97cf6a7bbcd608195883de014.zip
OS API should return SHUTOFF, not STOPPED
The recent changes to vm_state/task_state changed the behavior of OS API to return STOPPED instead of SHUTOFF. Fixes bug 1019016 The API spec says that SHUTOFF should be returned: http://docs.openstack.org/api/openstack-compute/2/content/List_Servers-d1e2078.html Change-Id: I0a6c786dc8d6b8b42f462cfbec5b70cb67aa2385
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 eacd9b8cb..0010ca61a 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',