summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-19 03:14:01 +0000
committerGerrit Code Review <review@openstack.org>2013-04-19 03:14:01 +0000
commit7c2b662dc6923b88ce9d3ae3a7262368cceff9b2 (patch)
tree8f59a8be709c93c668f54f10d148b414670ca650 /nova/api
parentafdf74b9a900a00fba1a3ba224b3bc688bb9553a (diff)
parent7e006ca39fc57e35244f471c0f0bb6773fdbbc28 (diff)
Merge "Don't swallow PolicyNotAuthorized for resize/reboot actions"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py9
1 files changed, 0 insertions, 9 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 12efa5eb4..cf200e50a 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -1031,9 +1031,6 @@ class Controller(wsgi.Controller):
except exception.InstanceInvalidState as state_error:
common.raise_http_conflict_for_instance_invalid_state(state_error,
'confirmResize')
- except Exception, e:
- LOG.exception(_("Error in confirm-resize %s"), e)
- raise exc.HTTPBadRequest()
return exc.HTTPNoContent()
@wsgi.response(202)
@@ -1054,9 +1051,6 @@ class Controller(wsgi.Controller):
except exception.InstanceInvalidState as state_error:
common.raise_http_conflict_for_instance_invalid_state(state_error,
'revertResize')
- except Exception, e:
- LOG.exception(_("Error in revert-resize %s"), e)
- raise exc.HTTPBadRequest()
return webob.Response(status_int=202)
@wsgi.response(202)
@@ -1084,9 +1078,6 @@ class Controller(wsgi.Controller):
except exception.InstanceInvalidState as state_error:
common.raise_http_conflict_for_instance_invalid_state(state_error,
'reboot')
- except Exception, e:
- LOG.exception(_("Error in reboot %s"), e, instance=instance)
- raise exc.HTTPUnprocessableEntity()
return webob.Response(status_int=202)
def _resize(self, req, instance_id, flavor_id, **kwargs):