diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-05-15 14:25:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-05-15 14:25:46 +0000 |
| commit | 1cea79f58123f071160eab2803a1495639fd9f64 (patch) | |
| tree | 71b43a7a991fda2da2a6f2811630eac20c15d59d /nova/api | |
| parent | 373058e8a152d8fc30ef8c0be68c7b054d2ac43c (diff) | |
| parent | ba7251e1fc71e890197effd27853dc22a0baa08d (diff) | |
| download | nova-1cea79f58123f071160eab2803a1495639fd9f64.tar.gz | |
Merge "Downgrade and fix log message for floating ip already disassociated"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/floating_ips.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py index b1731fba27..0bf9bd3ba3 100644 --- a/nova/api/openstack/compute/contrib/floating_ips.py +++ b/nova/api/openstack/compute/contrib/floating_ips.py @@ -186,7 +186,9 @@ class FloatingIPController(object): try: disassociate_floating_ip(self, context, instance, address) except exception.FloatingIpNotAssociated: - LOG.info(_("Floating ip %s has been disassociated") % address) + msg = ("Floating ip %s has already been disassociated, " + "perhaps by another concurrent action.") % address + LOG.debug(msg) # release ip from project self.network_api.release_floating_ip(context, address) |