diff options
| author | James Cammarata <jimi@sngx.net> | 2015-08-20 17:32:05 -0400 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2015-08-22 12:32:40 -0400 |
| commit | 85ddb1b90232dbd68798e9b2d7dafa5689a1d30e (patch) | |
| tree | 64bb65cf2934b792cd676267dbe6d2e1d4931f9e | |
| parent | 630e8ef9a6bb65cad1386be98e9c6825448fb7e7 (diff) | |
| download | ansible-modules-core-85ddb1b90232dbd68798e9b2d7dafa5689a1d30e.tar.gz | |
Fixing region requirement regarding euca clusters
Fixes ansible/ansible#11023
| -rw-r--r-- | cloud/amazon/ec2.py | 7 |
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 = [] |