Fixing region requirement regarding euca clusters

Fixes ansible/ansible#11023
ansible · Aug 20, 2015 · 9d94e55 · 9d94e55
1 parent c228739
commit 9d94e55
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
@@ -824,7 +824,10 @@ def create_instances(module, ec2, vpc, override_count=None):
 
     vpc_id = None
     if vpc_subnet_id:
-        vpc_id = vpc.get_all_subnets(subnet_ids=[vpc_subnet_id])[0].vpc_id
+        if not vpc:
+            module.fail_json(msg="region must be specified")
+        else:
+            vpc_id = vpc.get_all_subnets(subnet_ids=[vpc_subnet_id])[0].vpc_id
     else:
         vpc_id = None
 
@@ -1281,7 +1284,7 @@ def main():
         except boto.exception.NoAuthHandlerFound, e:
             module.fail_json(msg = str(e))
     else:
-        module.fail_json(msg="region must be specified")
+        vpc = None
 
     tagged_instances = []