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

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

Browse source
This commit is contained in:
James Cammarata 2014-07-09 12:09:40 -05:00
commit 812098b07e
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cloud/ec2
View file

@ -921,7 +921,15 @@ def create_instances(module, ec2, override_count=None):
num_running = 0 num_running = 0
wait_timeout = time.time() + wait_timeout wait_timeout = time.time() + wait_timeout
while wait_timeout > time.time() and num_running < len(instids): while wait_timeout > time.time() and num_running < len(instids):
res_list = ec2.get_all_instances(instids) try:
res_list = ec2.get_all_instances(instids)
except boto.exception.BotoSeverError, e:
if e.error_code == 'InvalidInstanceID.NotFound':
time.sleep(1)
continue
else:
raise
num_running = 0 num_running = 0
for res in res_list: for res in res_list:
num_running += len([ i for i in res.instances if i.state=='running' ]) num_running += len([ i for i in res.instances if i.state=='running' ])