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

Merge pull request #3341 from Shrews/os_server_wait

Browse source 
Pass wait/timeout parameters to floating IP APIs in os_server
This commit is contained in:
René Moser 2016-03-31 15:32:58 +02:00
commit 18367243e4
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: