summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-30 20:27:34 +0000
committerGerrit Code Review <review@openstack.org>2013-01-30 20:27:34 +0000
commitb5d242b209c80b375c576b6428056797427067f1 (patch)
tree9dcff6e7a8b9c644d5de71e64c3540c33bd94cce /nova/api
parent23f28a8c20a8c7bdd7bece2d3ae6ea8036d95512 (diff)
parent84a83c67d81f41c00ca9259ebebec97e6e7788bb (diff)
Merge "Fix boot with image not active"
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 93a07ec3f..90d4c37b3 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -911,6 +911,8 @@ class Controller(wsgi.Controller):
except exception.ImageNotFound as error:
msg = _("Can not find requested image")
raise exc.HTTPBadRequest(explanation=msg)
+ except exception.ImageNotActive as error:
+ raise exc.HTTPBadRequest(explanation=unicode(error))
except exception.FlavorNotFound as error:
msg = _("Invalid flavorRef provided.")
raise exc.HTTPBadRequest(explanation=msg)