ensures sec groups is within the same VPC.

util/vpc-tools/abbey.py

@@ -193,27 +193,37 @@ def parse_args():
     return parser.parse_args()
 
 
-def create_instance_args():
-    """
-    Looks up security group, subnet
-    and returns arguments to pass into
-    ec2.run_instances() including
-    user data
-    """
+def get_instance_sec_group(vpc_id, security_group):
 
     security_group_id = None
 
-    grp_details = ec2.get_all_security_groups()
+    grp_details = ec2.get_all_security_groups(
+        filters={
+            'vpc_id':vpc_id
+        }
+    )
 
     for grp in grp_details:
-        if grp.name == args.security_group:
+        if grp.name == security_group:
             security_group_id = grp.id
             break
+
     if not security_group_id:
         print "Unable to lookup id for security group {}".format(
             args.security_group)
         sys.exit(1)
 
+    return security_group_id
+
+
+def create_instance_args():
+    """
+    Looks up security group, subnet
+    and returns arguments to pass into
+    ec2.run_instances() including
+    user data
+    """
+
     vpc = VPCConnection()
     subnet = vpc.get_all_subnets(
         filters={
@@ -225,6 +235,9 @@ def create_instance_args():
             len(subnet)))
         sys.exit(1)
     subnet_id = subnet[0].id
+    vpc_id = subnet[0].vpc_id
+
+    security_group_id = get_instance_sec_group(vpc_id, security_group)
 
     if args.identity:
         config_secure = 'true'