summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-08-18 14:56:22 -0500
committerJosh Kearney <josh@jk0.org>2011-08-18 14:56:22 -0500
commitfe28c88a6bfff9d8e0d83751ab89e83173aaf092 (patch)
treefa43132f0b61627368123f2e607fa4d9f0d59266 /nova/api
parenta9d87715133ae79518cef6aafd87c95e26f20765 (diff)
downloadnova-fe28c88a6bfff9d8e0d83751ab89e83173aaf092.tar.gz
nova-fe28c88a6bfff9d8e0d83751ab89e83173aaf092.tar.xz
nova-fe28c88a6bfff9d8e0d83751ab89e83173aaf092.zip
Review feedback.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/contrib/rescue.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/contrib/rescue.py b/nova/api/openstack/contrib/rescue.py
index 65ce2874b..5ee071696 100644
--- a/nova/api/openstack/contrib/rescue.py
+++ b/nova/api/openstack/contrib/rescue.py
@@ -48,7 +48,7 @@ class Rescue(exts.ExtensionDescriptor):
self.compute_api.unrescue(context, instance_id)
except Exception, e:
LOG.exception(_("Error in %(action)s: %(e)s") % locals())
- return faults.Fault(exc.HTTPBadRequest())
+ return faults.Fault(exc.HTTPInternalServerError())
return webob.Response(status_int=202)
@@ -60,7 +60,7 @@ class Rescue(exts.ExtensionDescriptor):
return "Rescue"
def get_alias(self):
- return "rescue"
+ return "os-rescue"
def get_description(self):
return "Instance rescue mode"