cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pass wait/timeout parameters to floating IP APIs in os_server

Browse source 
If a server already exists when os_server is run, but a floating
IP was not assigned to the server when one was requested, the
module will attempt to add an IP to the existing server. But it
would not pass the wait/timeout params to the floating IP APIs.
If wait was True, you could get back a server dict that did not
show the floating IP because it did not wait.
This commit is contained in:
David Shrewsbury 2016-03-29 13:42:41 -04:00
parent 458c3056c4
commit aecec868d5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cloud/openstack/os_server.py
View file

@ -498,6 +498,8 @@ def _check_floating_ips(module, cloud, server):
auto_ip=auto_ip, auto_ip=auto_ip,
ips=floating_ips, ips=floating_ips,
ip_pool=floating_ip_pools, ip_pool=floating_ip_pools,
wait=module.params['wait'],
timeout=module.params['timeout'],
) )
changed = True changed = True
elif floating_ips: elif floating_ips:
@ -508,7 +510,9 @@ def _check_floating_ips(module, cloud, server):
if ip not in ips: if ip not in ips:
missing_ips.append(ip) missing_ips.append(ip)
if missing_ips: if missing_ips:
server = cloud.add_ip_list(server, missing_ips) server = cloud.add_ip_list(server, missing_ips,
wait=module.params['wait'],
timeout=module.params['timeout'])
changed = True changed = True
extra_ips = [] extra_ips = []
for ip in ips: for ip in ips: