never easy

util/vpc-tools/abbey.py

@@ -185,11 +185,21 @@ def create_instance_args():
     subnet = vpc.get_all_subnets(
         filters={
             'tag:aws:cloudformation:stack-name': stack_name,
-            'tag:play': args.play,
-            'tag:cluster': args.play,
-            'tag:environment': args.environment,
-            'tag:deployment': args.deployment }
+            'tag:play': args.play}
     )
+
+    if len(subnet) < 1:
+        #
+        # try scheme for non-cloudformation builds
+        #
+
+        subnet = vpc.get_all_subnets(
+            filters={
+                'tag:cluster': args.play,
+                'tag:environment': args.environment,
+                'tag:deployment': args.deployment}
+        )
+
     if len(subnet) < 1:
         sys.stderr.write("ERROR: Expected at least one subnet, got {}\n".format(
             len(subnet)))