diff options
| author | Eoghan Glynn <eglynn@redhat.com> | 2015-04-20 20:23:29 +0000 |
|---|---|---|
| committer | Eoghan Glynn <eglynn@redhat.com> | 2015-04-20 20:29:20 +0000 |
| commit | 0784b0caf335de1d0752bbad5923471574c5dd03 (patch) | |
| tree | 3e007229a731ea5be3454f123648ceac4b3d13d4 | |
| parent | cd5a0b3146f734a40bc87be36c5a67e0e5e433be (diff) | |
| download | nova-0784b0caf335de1d0752bbad5923471574c5dd03.tar.gz | |
Avoid referring to juno-era exception type
The stable/icehouse backport for I53b0c9d949404288e8687b304361a74b53d69ef3
broke handling of Not Authorized from neutron, by referring to a excpetion
class renamed in juno (i.e. exception.NotAuthorized was renamed as
exception.Forbidden).
Change-Id: I9576eb7372195f2479d763f27a5d30a6a4bade21
Closes-Bug: #1446376
| -rw-r--r-- | nova/api/openstack/compute/contrib/floating_ips.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index 8ee43e5065..368d2816ec 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -183,7 +183,7 @@ class FloatingIPController(object): try: self.network_api.disassociate_and_release_floating_ip( context, instance, floating_ip) - except exception.Forbidden: + except exception.NotAuthorized: raise webob.exc.HTTPForbidden() except exception.CannotDisassociateAutoAssignedFloatingIP: msg = _('Cannot disassociate auto assigned floating ip') |