summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2011-05-02 19:21:40 +0000
committerTarmac <>2011-05-02 19:21:40 +0000
commit46fc9dccf2d8666e6b64ad060b1deb4c3c591768 (patch)
treee3388ceb610504cf8bd9632eac21a606850c4f86 /nova/api
parent1a25bb43f68c63844b48b5729d4bcf78cdc94b5c (diff)
parente0e95c36f1d2c08c5ab419abdd8867c05d101475 (diff)
Modified the instance status returned by the OS api to more accurately represent its power state
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/views/servers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index e52bfaea3..bdc85f4a1 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -63,8 +63,8 @@ class ViewBuilder(object):
power_state.BLOCKED: 'ACTIVE',
power_state.SUSPENDED: 'SUSPENDED',
power_state.PAUSED: 'PAUSED',
- power_state.SHUTDOWN: 'ACTIVE',
- power_state.SHUTOFF: 'ACTIVE',
+ power_state.SHUTDOWN: 'SHUTDOWN',
+ power_state.SHUTOFF: 'SHUTOFF',
power_state.CRASHED: 'ERROR',
power_state.FAILED: 'ERROR'}