From: Justin Wind <j.wind@partner.samsung.com>
Date: Thu, 16 Mar 2017 17:33:23 +0000 (-0700)
Subject: fix asg/lc names
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=34bb0ce598fd4e3169164c8f2dee6272b53d80a1;p=awsible

fix asg/lc names
---

diff --git a/roles/autoscalinggroup/tasks/main.yml b/roles/autoscalinggroup/tasks/main.yml
index 694f7dc..f4d2449 100644
--- 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 ced0bcd..bf0510f 100644
--- 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