Fixing region requirement regarding euca clusters

Fixes ansible/ansible#11023
reviewable/pr18780/r1
James Cammarata 9 years ago
parent 630e8ef9a6
commit 85ddb1b902

@ -824,7 +824,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
@ -1281,7 +1284,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 = []

Loading…
Cancel
Save