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

2014-07-09 12:09:40 -05:00 · 2014-07-09 12:09:40 -05:00 · 26707568c7
commit 26707568c7
parent 2c1e58b835 45cf1dbbc5
1 changed files with 9 additions and 1 deletions
--- a/library/cloud/ec2
+++ b/library/cloud/ec2
@ -921,7 +921,15 @@ def create_instances(module, ec2, override_count=None):
        num_running = 0
        wait_timeout = time.time() + wait_timeout
        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
            for res in res_list:
                num_running += len([ i for i in res.instances if i.state=='running' ])