summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-04-15 14:24:17 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-04-15 14:24:17 -0400
commitad138a5a50868531f34ba358600f1270588ce80b (patch)
treead6ceb12c6926d13fc5745d0db3e9b7ae3122f5b /nova/api
parent4b0785632ba626d34a8a9fae5e0a5c742660e2dc (diff)
correcting tests; pep8
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 2332b1af7..1cb42355a 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -561,7 +561,8 @@ class Controller(common.OpenstackController):
"""
image_id = image_meta['id']
if image_meta['status'] != 'active':
- raise exception.InstanceNotRunning(image_id=image_id)
+ raise exception.ImageUnacceptable(image_id=image_id,
+ reason=_("status is not active"))
if image_meta.get('container_format') != 'ami':
return None, None