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

Fixing region requirement regarding euca clusters

Browse source 
Fixes ansible/ansible#11023
This commit is contained in:
James Cammarata 2015-08-20 17:32:05 -04:00 committed by Matt Clay
parent 51154a6991
commit b9ca912ffe
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/modules/cloud/amazon/ec2.py
View file

@ -830,7 +830,10 @@ def create_instances(module, ec2, vpc, override_count=None):
vpc_id = None vpc_id = None
if vpc_subnet_id: 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: else:
vpc_id = None vpc_id = None
@ -1303,7 +1306,7 @@ def main():
except boto.exception.NoAuthHandlerFound, e: except boto.exception.NoAuthHandlerFound, e:
module.fail_json(msg = str(e)) module.fail_json(msg = str(e))
else: else:
module.fail_json(msg="region must be specified") vpc = None
tagged_instances = [] tagged_instances = []