ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge branch 'issue_7848' of https://github.com/mpeters/ansible into mpeters-issue_7848

Browse source
This commit is contained in:
James Cammarata 2014-07-09 12:24:06 -05:00
commit 0798f3cda4
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/cloud/ec2_vpc
View file

@ -293,6 +293,7 @@ def create_vpc(module, vpc_conn):
pending = True pending = True
wait_timeout = time.time() + wait_timeout wait_timeout = time.time() + wait_timeout
while wait and wait_timeout > time.time() and pending: while wait and wait_timeout > time.time() and pending:
try:
pvpc = vpc_conn.get_all_vpcs(vpc.id) pvpc = vpc_conn.get_all_vpcs(vpc.id)
if hasattr(pvpc, 'state'): if hasattr(pvpc, 'state'):
if pvpc.state == "available": if pvpc.state == "available":
@ -300,6 +301,12 @@ def create_vpc(module, vpc_conn):
elif hasattr(pvpc[0], 'state'): elif hasattr(pvpc[0], 'state'):
if pvpc[0].state == "available": if pvpc[0].state == "available":
pending = False pending = False
# sometimes vpc_conn.create_vpc() will return a vpc that can't be found yet by vpc_conn.get_all_vpcs()
# when that happens, just wait a bit longer and try again
except boto.exception.BotoServerError, e:
if e.error_code != 'InvalidVpcID.NotFound':
raise
if pending:
time.sleep(5) time.sleep(5)
if wait and wait_timeout <= time.time(): if wait and wait_timeout <= time.time():
# waiting took too long # waiting took too long