summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2015-08-20 17:32:05 -0400
committerJames Cammarata <jimi@sngx.net>2015-08-20 17:33:01 -0400
commit9d94e55a5738cb1ab65f9a0070416e318d4dfc3a (patch)
treedb5f588600a92bed85c95268b6d6dfe0638de513
parentc228739f2d4bad234529c1f6e3731ba3297646b9 (diff)
downloadansible-modules-core-issue_11023_ec2_euca.tar.gz
Fixing region requirement regarding euca clustersissue_11023_ec2_euca
Fixes ansible/ansible#11023
-rw-r--r--cloud/amazon/ec2.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/cloud/amazon/ec2.py b/cloud/amazon/ec2.py
index 55c45a64..c2b57eb7 100644
--- 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 = []