diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-06-28 21:45:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-06-28 21:45:24 +0000 |
| commit | f6bed8f7ed85c6efb5fbf79122a8a4afa8add7ed (patch) | |
| tree | e2a28f72253f592e02db0de125c145e2bebe8e63 | |
| parent | f506dc6f9bd375b6a00814f27a3428a4b92e6f38 (diff) | |
| parent | 15442adb01d52f51299063641677cba43768a8db (diff) | |
| download | nova-f6bed8f7ed85c6efb5fbf79122a8a4afa8add7ed.tar.gz nova-f6bed8f7ed85c6efb5fbf79122a8a4afa8add7ed.tar.xz nova-f6bed8f7ed85c6efb5fbf79122a8a4afa8add7ed.zip | |
Merge "Ignore floatingIpNotAssociated during disassociation."
| -rw-r--r-- | nova/network/manager.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 2fc75eec1..402513faf 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -370,8 +370,12 @@ class FloatingIP(object): # disassociate floating ips related to fixed_ip for floating_ip in floating_ips: address = floating_ip['address'] - self.disassociate_floating_ip(read_deleted_context, address, - affect_auto_assigned=True) + try: + self.disassociate_floating_ip(read_deleted_context, + address, + affect_auto_assigned=True) + except exception.FloatingIpNotAssociated: + LOG.exception(_("Floating IP is not associated. Ignore.")) # deallocate if auto_assigned if floating_ip['auto_assigned']: self.deallocate_floating_ip(read_deleted_context, address, |