summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-13 21:55:10 +0000
committerGerrit Code Review <review@openstack.org>2012-01-13 21:55:10 +0000
commite08eeea94f0bc27d5bff5ae428e36fb32aaef58c (patch)
treede134fc8adc34a11189be4cc6500e5cdae24a258 /nova/api
parentf9e53c4031150173691f5474b3e495ee4f918fda (diff)
parent9c1f5d49d7d2783054d1e01361298cddafeeec78 (diff)
downloadnova-e08eeea94f0bc27d5bff5ae428e36fb32aaef58c.tar.gz
nova-e08eeea94f0bc27d5bff5ae428e36fb32aaef58c.tar.xz
nova-e08eeea94f0bc27d5bff5ae428e36fb32aaef58c.zip
Merge "have all quota errors return an http 413"
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 71dc1e2ae..e90e30b7d 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -478,7 +478,8 @@ class Controller(wsgi.Controller):
raise exc.HTTPRequestEntityTooLarge(explanation=expl,
headers={'Retry-After': 0})
# if the original error is okay, just reraise it
- raise error
+ raise exc.HTTPRequestEntityTooLarge(explanation=error.msg,
+ headers={'Retry-After': 0})
def _validate_server_name(self, value):
if not isinstance(value, basestring):