diff options
Diffstat (limited to 'cloud/amazon/ec2.py')
| -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 = [] |