From 3c5dba85a0208044f9d90d1c26e358b9ff4512ca Mon Sep 17 00:00:00 2001
From: ipvsean <sean@cavanaugh.pro>
Date: Tue, 25 Feb 2020 19:16:52 -0500
Subject: [PATCH] sync content

---
 playbooks/group_vars/all/25_blah.yml          | 25 ------------
 playbooks/group_vars/all/all.yml              |  1 -
 roles/install_demo/tasks/add_job_template.yml | 38 +++++++++----------
 roles/install_demo/tasks/main.yml             | 10 +----
 4 files changed, 21 insertions(+), 53 deletions(-)
 delete mode 100644 playbooks/group_vars/all/25_blah.yml

diff --git a/playbooks/group_vars/all/25_blah.yml b/playbooks/group_vars/all/25_blah.yml
deleted file mode 100644
index 919ee17..0000000
--- a/playbooks/group_vars/all/25_blah.yml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-test_survey:
-  name: L3 Survey
-  description: Prompt for interface name, ipv4 and ipv6
-  spec:
-  - type: text
-    question_name: Which interface?
-    question_description: Please specify the interface name
-    variable: interface_name
-    required: true
-    default: lo0
-  - type: text
-    question_name: Please set an IPv4 Address
-    question_description: e.g. 192.168.1.1/24, it is OK to leave this blank if you are
-      using IPv6 only
-    variable: interface_ipv4
-    required: false
-    default: 192.168.1.1/24
-  - type: text
-    question_name: Please Set an IPv6 Address
-    question_description: e.g. fc00::2/64, it is OK to leave this blank if you are using
-      IPv4 only
-    variable: interface_ipv6
-    required: false
-    default: fc00::2/64
diff --git a/playbooks/group_vars/all/all.yml b/playbooks/group_vars/all/all.yml
index 3f2ea04..968e562 100644
--- a/playbooks/group_vars/all/all.yml
+++ b/playbooks/group_vars/all/all.yml
@@ -1,4 +1,3 @@
----
 demos:
   deploy_application:
     name: "Deploy Application (survey)"
diff --git a/roles/install_demo/tasks/add_job_template.yml b/roles/install_demo/tasks/add_job_template.yml
index df83af4..94a8553 100644
--- a/roles/install_demo/tasks/add_job_template.yml
+++ b/roles/install_demo/tasks/add_job_template.yml
@@ -1,32 +1,32 @@
-- name: add deploy application job template
+- name: add job template without survey
   tower_job_template:
-    name: "{{demos[demo].name}}"
-    job_type: "{{demos[demo].job_type}}"
-    inventory: "{{demos[demo].inventory}}"
-    project: "{{demos[demo].project}}"
-    playbook: "{{demos[demo].playbook}}"
-    credential: "{{demos[demo].credential}}"
-    survey_enabled: "{{demos[demo].survey_enabled}}"
+    name: "{{item.value.name}}"
+    job_type: "{{item.value.job_type}}"
+    inventory: "{{item.value.inventory}}"
+    project: "{{item.value.project}}"
+    playbook: "{{item.value.playbook}}"
+    credential: "{{item.value.credential}}"
+    survey_enabled: "{{item.value.survey_enabled}}"
     tower_username: "{{my_tower_username}}"
     tower_password: "{{my_tower_password}}"
     tower_host: "{{my_tower_host}}"
     validate_certs: no
   when:
-    - not demos[demo].survey_enabled
+    - not item.value.survey_enabled
 
-- name: add deploy application job template
+- name: add job template with survey
   tower_job_template:
-    name: "{{demos[demo].name}}"
-    job_type: "{{demos[demo].job_type}}"
-    inventory: "{{demos[demo].inventory}}"
-    project: "{{demos[demo].project}}"
-    playbook: "{{demos[demo].playbook}}"
-    credential: "{{demos[demo].credential}}"
-    survey_enabled: "{{demos[demo].survey_enabled}}"
-    survey_spec: "{{demos[demo].survey_spec}}"
+    name: "{{item.value.name}}"
+    job_type: "{{item.value.job_type}}"
+    inventory: "{{item.value.inventory}}"
+    project: "{{item.value.project}}"
+    playbook: "{{item.value.playbook}}"
+    credential: "{{item.value.credential}}"
+    survey_enabled: "{{item.value.survey_enabled}}"
+    survey_spec: "{{item.value.survey_spec}}"
     tower_username: "{{my_tower_username}}"
     tower_password: "{{my_tower_password}}"
     tower_host: "{{my_tower_host}}"
     validate_certs: no
   when:
-    - demos[demo].survey_enabled
+    - item.value.survey_enabled
diff --git a/roles/install_demo/tasks/main.yml b/roles/install_demo/tasks/main.yml
index 7857377..d9e79db 100644
--- a/roles/install_demo/tasks/main.yml
+++ b/roles/install_demo/tasks/main.yml
@@ -11,12 +11,6 @@
     tower_host: "{{my_tower_host}}"
     validate_certs: no
 
-- name: install job template
+- name: install all job templates
   include: add_job_template.yml
-  when: demo != "all"
-
-- name: install job template
-  include: add_job_template.yml
-  when: demo == "all"
-  with_items:
-    - demos
+  loop: "{{ demos|dict2items }}"