fix asg/lc names

[awsible] / roles / autoscalinggroup / tasks / main.yml

diff --git a/roles/autoscalinggroup/tasks/main.yml b/roles/autoscalinggroup/tasks/main.yml
index d0c1692acde1e2e75b84586557a252f2dc703259..f4d2449bd43fe597a9807a5c71c4b064b743c726 100644 (file)
--- a/roles/autoscalinggroup/tasks/main.yml
+++ b/roles/autoscalinggroup/tasks/main.yml
@@ -10,11 +10,16 @@
 - set_fact:
     asg_n:
     - "{{ module }}"
-    - "{{ stack }}"
-    - "{{ country|ternary('c0', '') }}{{ country|default('') }}"
-    - "{{ phase|ternary('d0', '') }}{{ phase|default('') }}"
+    - "{{ stack|default() }}"
+    - "{{ country|default()|ternary('c0', '') }}{{ country|default() }}"
+    - "{{ phase|default()|ternary('d0', '') }}{{ phase|default() }}"
+
+- set_fact:
+    partial_subnet_ids: "{{ subnet_ids }}"
+  when: subnet_ids is defined
 
 - name: suss out our subnets
+  when: partial_subnet_ids is not defined
   ec2_vpc_subnet_facts:
     region: "{{ vpc_region }}"
     filters:
@@ -39,10 +44,10 @@
       propagate_at_launch: yes
     - module: "{{ module }}"
       propagate_at_launch: yes
-    - stack: "{{ stack }}"
+    - stack: "{{ stack|default() }}"
       propagate_at_launch: yes
-    - country: "{{ country }}"
+    - country: "{{ country|default() }}"
       propagate_at_launch: yes
-    - phase: "{{ phase }}"
+    - phase: "{{ phase|default() }}"
       propagate_at_launch: yes