diff options
| author | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-04-18 21:06:29 +0400 |
|---|---|---|
| committer | Ilya Alekseyev <ialekseev@griddynamics.com> | 2011-04-18 21:06:29 +0400 |
| commit | 9a0d079cfe28d6d8d4e909f68541efda5ad3a3c5 (patch) | |
| tree | fd62ca3d58386ba5b43452be8b3067e50f16a252 /nova/compute | |
| parent | e724baee5a76e38bff151148ab8c295f6fdb53dc (diff) | |
not performing floating ip operation with auto allocated ips
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 94fee36a5..829d59170 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -308,7 +308,8 @@ class ComputeManager(manager.SchedulerDependentManager): network_topic, {"method": "disassociate_floating_ip", "args": {"floating_address": address}}) - if FLAGS.auto_assign_floating_ip: + if FLAGS.auto_assign_floating_ip \ + and floating_ip.get('auto_assigned'): LOG.debug(_("Deallocating floating ip %s"), floating_ip['address'], context=context) rpc.cast(context, |