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

Merge branch 'fix_ec2_eip' of https://github.com/jsmartin/ansible into jsmartin-fix_ec2_eip

Browse source
This commit is contained in:
James Cammarata 2014-07-25 12:37:36 -05:00
commit 3281139981
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
library/cloud/ec2_eip
View file

@ -138,11 +138,23 @@ def disassociate_ip_and_instance(ec2, address, instance_id, module):
def find_address(ec2, public_ip, module):
""" Find an existing Elastic IP address """
try:
addresses = ec2.get_all_addresses([public_ip])
except boto.exception.EC2ResponseError, e:
module.fail_json(msg=str(e.message))
wait_timeout = 600
wait_timeout = time.time() + wait_timeout
while wait_timeout > time.time():
try:
addresses = ec2.get_all_addresses([public_ip])
break
except boto.exception.EC2ResponseError, e:
if "Address '%s' not found." % public_ip in e.message :
pass
else:
module.fail_json(msg=str(e.message))
time.sleep(5)
if wait_timeout <= time.time():
module.fail_json(msg = "wait for EIPs timeout on %s" % time.asctime())
return addresses[0]