diff options
| -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, |