summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-01 14:20:36 +0000
committerGerrit Code Review <review@openstack.org>2013-05-01 14:20:36 +0000
commit69991d60cffbdc715faff2d55727a161f8e57051 (patch)
treef52210b9ec18b4eb97fec92dec1ff126baef2d85 /nova/api
parent7cd8f22354b4ba5768cda410267c225449f78b8d (diff)
parent09c7fc3b694ab401d42c9e59b17e24bbe4383588 (diff)
Merge "Catch glance image create exceptions"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index cf200e50a..bc4ba67df 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -1357,6 +1357,8 @@ class Controller(wsgi.Controller):
except exception.InstanceInvalidState as state_error:
common.raise_http_conflict_for_instance_invalid_state(state_error,
'createImage')
+ except exception.Invalid as err:
+ raise exc.HTTPBadRequest(explanation=str(err))
# build location of newly-created image entity
image_id = str(image['id'])