diff options
| author | Jesse Andrews <anotherjesse@gmail.com> | 2011-08-16 11:46:22 -0700 |
|---|---|---|
| committer | Jesse Andrews <anotherjesse@gmail.com> | 2011-08-16 11:46:22 -0700 |
| commit | fb43ea94e81e5eec51b73c2aab4a8a38cdf71361 (patch) | |
| tree | 04cc662b9c4d791a935b6243a285b9a34726a74b /nova/api | |
| parent | 83b45a371665fd069fc7e372628f82874258fd08 (diff) | |
| download | nova-fb43ea94e81e5eec51b73c2aab4a8a38cdf71361.tar.gz nova-fb43ea94e81e5eec51b73c2aab4a8a38cdf71361.tar.xz nova-fb43ea94e81e5eec51b73c2aab4a8a38cdf71361.zip | |
make delete more consistant
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/contrib/floating_ips.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py index 722320534..1276c0118 100644 --- a/nova/api/openstack/contrib/floating_ips.py +++ b/nova/api/openstack/contrib/floating_ips.py @@ -105,13 +105,13 @@ class FloatingIPController(object): ip = self.network_api.get_floating_ip(context, id) if 'fixed_ip' in ip: - self.disassociate(req, id) + try: + self.disassociate(req, id) + except exception.ApiError: + LOG.warn("disassociate failure %s", id) self.network_api.release_floating_ip(context, address=ip['address']) - - return {'released': { - "id": ip['id'], - "floating_ip": ip['address']}} + return exc.HTTPAccepted() def associate(self, req, id, body): """ /floating_ips/{id}/associate fixed ip in body """ |