summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2015-09-17 11:25:35 -0400
committerJames Cammarata <jimi@sngx.net>2015-09-17 11:25:35 -0400
commitd2c7d30c505d1c1bcdca1fb2d5e990b8878da3de (patch)
tree57f9bd551713ca31f0f9c448f1c99e6f034f8e71
parent78e756b05d5892f7a41ade51cd84e2abc85726b3 (diff)
parenta2979a3102d513cfae8c3a4258e015c5b80b6cbc (diff)
downloadansible-modules-core-d2c7d30c505d1c1bcdca1fb2d5e990b8878da3de.tar.gz
Merge pull request #250 from saito-hideki/bug/249
The nova_compute module create a list of un-use floating ip by value of fixed_ip
-rw-r--r--cloud/openstack/_nova_compute.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud/openstack/_nova_compute.py b/cloud/openstack/_nova_compute.py
index 00380de3..53af962a 100644
--- a/cloud/openstack/_nova_compute.py
+++ b/cloud/openstack/_nova_compute.py
@@ -324,7 +324,7 @@ def _add_floating_ip_from_pool(module, nova, server):
# loop through all floating IPs
for f_ip in all_floating_ips:
# if not reserved and the correct pool, add
- if f_ip.instance_id is None and (f_ip.pool == pool):
+ if f_ip.fixed_ip is None and (f_ip.pool == pool):
pool_ips.append(f_ip.ip)
# only need one
break