diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-12 02:46:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-12 02:46:11 +0000 |
| commit | fa4751edef2c12c4e28372659d39c8902f2e9990 (patch) | |
| tree | 5510a811162c2b6359c6c211cb58455893e860ef /nova/api | |
| parent | 2cc409c6f0ae61b1c1833ce679b603d0369b42e8 (diff) | |
| parent | b5f75253048438891a8740a1ea4719e5f3208ccb (diff) | |
| download | nova-fa4751edef2c12c4e28372659d39c8902f2e9990.tar.gz nova-fa4751edef2c12c4e28372659d39c8902f2e9990.tar.xz nova-fa4751edef2c12c4e28372659d39c8902f2e9990.zip | |
Merge "Sub in InstanceLimitExceeded in overLimit message"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 2bfbfb745..0be57793c 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -491,7 +491,8 @@ class Controller(wsgi.Controller): "InstanceLimitExceeded": error.message, } - expl = code_mappings.get(error.kwargs['code'], error.message) + code = error.kwargs['code'] + expl = code_mappings.get(code, error.message) % error.kwargs raise exc.HTTPRequestEntityTooLarge(explanation=expl, headers={'Retry-After': 0}) |