fix asg/lc names

diff --git a/roles/autoscalinggroup/tasks/main.yml b/roles/autoscalinggroup/tasks/main.yml
index 694f7dce6a860c06c29bd578977603f7d737c0a4..f4d2449bd43fe597a9807a5c71c4b064b743c726 100644 (file)
--- a/roles/autoscalinggroup/tasks/main.yml
+++ b/roles/autoscalinggroup/tasks/main.yml
@@ -11,8 +11,8 @@
     asg_n:
     - "{{ module }}"
     - "{{ stack|default() }}"
-    - "{{ (country|default() != '')|ternary('c0', '') }}{{ country|default('') }}"
-    - "{{ (phase|default() != '')|ternary('d0', '') }}{{ phase|default('') }}"
+    - "{{ country|default()|ternary('c0', '') }}{{ country|default() }}"
+    - "{{ phase|default()|ternary('d0', '') }}{{ phase|default() }}"
 
 - set_fact:
     partial_subnet_ids: "{{ subnet_ids }}"

diff --git a/roles/launchconfig/tasks/main.yml b/roles/launchconfig/tasks/main.yml
index ced0bcd16dc8f2ae742429f6fc149fc85bde69af..bf0510f730e004ba0beb0773168f56920d05bcf2 100644 (file)
--- a/roles/launchconfig/tasks/main.yml
+++ b/roles/launchconfig/tasks/main.yml
@@ -12,22 +12,22 @@
 - set_fact:
     ud_cluster:
     - "{{ module }}"
-    - "{{ (country|default() != '')|ternary('c0', '') }}{{ country|default('') }}"
-    - "{{ (phase|default() != '')|ternary('d0', '') }}{{ phase|default('') }}"
+    - "{{ country|default()|ternary('c0', '') }}{{ country|default() }}"
+    - "{{ phase|default()|ternary('d0', '') }}{{ phase|default() }}"
 
 - set_fact:
     ud_asgn:
     - "{{ module }}"
-    - "{{ stack|default('') }}"
-    - "{{ (country|default() != '')|ternary('c0', '') }}{{ country|default('') }}"
-    - "{{ (phase|default() != '')|ternary('d0', '') }}{{ phase|default('') }}"
+    - "{{ stack|default() }}"
+    - "{{ country|default()|ternary('c0', '') }}{{ country|default() }}"
+    - "{{ phase|default()|ternary('d0', '') }}{{ phase|default() }}"
 
 - set_fact:
     lc_n:
     - "{{ module }}"
-    - "{{ stack|default('') }}"
-    - "{{ (country|default() != '')|ternary('c0', '') }}{{ country|default('') }}"
-    - "{{ (phase|default() != '')|ternary('d0', '') }}{{ phase|default('') }}"
+    - "{{ stack|default() }}"
+    - "{{ country|default()|ternary('c0', '') }}{{ country|default() }}"
+    - "{{ phase|default()|ternary('d0', '') }}{{ phase|default() }}"
     - "{{ version }}"
 
 - name: assemble user data