diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-01-24 22:24:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-01-24 22:24:57 +0000 |
| commit | bf5f01ce637ad80c46c2d30bd563829f1e5bf18f (patch) | |
| tree | 8f088591fefe9601b85f27571fb5c5213aadfeb6 /nova/api | |
| parent | b328b0422035212c844ff5bbcc03f648fb7a2779 (diff) | |
| parent | 8279240ee30d55d127e4d964a9861b721ac7cc74 (diff) | |
| download | nova-bf5f01ce637ad80c46c2d30bd563829f1e5bf18f.tar.gz nova-bf5f01ce637ad80c46c2d30bd563829f1e5bf18f.tar.xz nova-bf5f01ce637ad80c46c2d30bd563829f1e5bf18f.zip | |
Merge "Handle error in associate floating IP (bug 845507)"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/floating_ips.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index afbdcf83a..46e2fe6fd 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -212,6 +212,9 @@ class FloatingIPActionController(wsgi.Controller): raise webob.exc.HTTPBadRequest(explanation=e.message) except exception.NotAuthorized, e: raise webob.exc.HTTPUnauthorized() + except rpc.RemoteError: + msg = _("Associate floating ip failed") + raise webob.exc.HTTPInternalServerError(explanation=msg) return webob.Response(status_int=202) |