clean up product demo readme to generate on flat-files

2020-03-09 15:53:16 -04:00
parent e3ef145d99
commit c091c76c3d
6 changed files with 97 additions and 98 deletions
--- a/README.md
+++ b/README.md
@@ -26,11 +26,20 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
    <th>Video Walkthrough</th>
    <th>Workshop Types</th>
  </tr>
+
  <tr>
-    <td>Create Developer Report</td>
-    <td>Sean Cavanaugh</td>
-    <td><pre>demo: developer_report</pre></td>
-    <td>Create HTML report using <a href="https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts">Ansible facts</a></td>
+    <td>SERVER / Fact Scan</td>
+    <td>Will Tome</td>
+    <td><pre>demo: fact_scan</pre></td>
+    <td>scan facts for Linux and Windows systems</td>
+    <td>Not available </td>
+    <td><ul><li>f5</li><li>rhel</li><li>windows</li></ul></td>
+  </tr>
+  <tr>
+    <td>SERVER / Patching</td>
+    <td>Will Tome</td>
+    <td><pre>demo: patching</pre></td>
+    <td>patching for Linux servers</td>
    <td>Not available </td>
    <td><ul><li>f5</li><li>rhel</li></ul></td>
  </tr>
@@ -42,22 +51,6 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
    <td>Not available </td>
    <td><ul><li>f5</li><li>rhel</li></ul></td>
  </tr>
-  <tr>
-    <td>Deploy Application (survey)</td>
-    <td>Sean Cavanaugh</td>
-    <td><pre>demo: deploy_application</pre></td>
-    <td>install yum applications on Linux with a survey</td>
-    <td><a href="https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED">Video Link</a></td>
-    <td><ul><li>f5</li><li>rhel</li></ul></td>
-  </tr>
-  <tr>
-    <td>SERVER / Fact Scan</td>
-    <td>Will Tome</td>
-    <td><pre>demo: fact_scan</pre></td>
-    <td>scan facts for Linux and Windows systems</td>
-    <td>Not available </td>
-    <td><ul><li>f5</li><li>rhel</li><li>windows</li></ul></td>
-  </tr>
  <tr>
    <td>SERVER / Hardening</td>
    <td>Will Tome</td>
@@ -66,14 +59,6 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
    <td>Not available </td>
    <td><ul><li>f5</li><li>rhel</li></ul></td>
  </tr>
-  <tr>
-    <td>SERVER / Patching</td>
-    <td>Will Tome</td>
-    <td><pre>demo: patching</pre></td>
-    <td>patching for Linux servers</td>
-    <td>Not available </td>
-    <td><ul><li>f5</li><li>rhel</li></ul></td>
-  </tr>
  <tr>
    <td>Windows IIS Server</td>
    <td>Colin McNaughton</td>
@@ -82,6 +67,22 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
    <td>Not available </td>
    <td><ul><li>windows</li></ul></td>
  </tr>
+  <tr>
+    <td>Deploy Application (survey)</td>
+    <td>Sean Cavanaugh</td>
+    <td><pre>demo: deploy_application</pre></td>
+    <td>install yum applications on Linux with a survey</td>
+    <td><a href="https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED">Video Link</a></td>
+    <td><ul><li>f5</li><li>rhel</li></ul></td>
+  </tr>
+  <tr>
+    <td>Create Developer Report</td>
+    <td>Sean Cavanaugh</td>
+    <td><pre>demo: developer_report</pre></td>
+    <td>Create HTML report using <a href="https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#variables-discovered-from-systems-facts">Ansible facts</a></td>
+    <td>Not available </td>
+    <td><ul><li>f5</li><li>rhel</li></ul></td>
+  </tr>
 </table>

 # Contribute
--- a/playbooks/generate_readme.yml
+++ b/playbooks/generate_readme.yml
@@ -4,11 +4,11 @@
  connection: local

  tasks:
-    - name: install demo
-      debug:
-        msg: "{{item.key}}"
-      loop: "{{ hostvars['localhost']|dict2items }}"
-      when: "item.key[:8] != 'ansible_'"
    # - name: install demo
-    #   include_role:
-    #     name: "../roles/generate_readme"
+    #   debug:
+    #     msg: "{{item}}"
+    #   loop: "{{dict(hostvars[inventory_hostname]|dictsort|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined'))|dict2items}}"
+
+    - name: install demo
+      include_role:
+        name: "../roles/generate_readme"
--- a/playbooks/group_vars/all/01_deploy_application.yml
+++ b/playbooks/group_vars/all/01_deploy_application.yml
@@ -8,7 +8,21 @@ deploy_application:
  playbook: "playbooks/01_deploy_application.yml"
  credential: "Workshop Credential"
  survey_enabled: yes
-  survey_spec: "{{survey_deploy_application}}"
+  survey_spec:
+    name: Deploy application survey
+    description: Which application do you want to install?
+    spec:
+      - type: multiplechoice
+        question_name: Select a command you would like to execute
+        question_description: select the application
+        variable: application
+        required: true
+        default: httpd
+        choices:
+          - httpd
+          - nginx
+          - htop
+          - gdb
  video: "https://www.youtube.com/watch?v=pU8ZgSBuEJw&list=PLdu06OJoEf2bp-PNtxPP_2n7Avkax8TED"
  project:
    name: "Ansible official demo project"
@@ -19,18 +33,3 @@ deploy_application:
  workshop_type:
    - f5
    - rhel
-survey_deploy_application:
-  name: Deploy application survey
-  description: Which application do you want to install?
-  spec:
-  - type: multiplechoice
-    question_name: Select a command you would like to execute
-    question_description: select the application
-    variable: application
-    required: true
-    default: httpd
-    choices:
-      - httpd
-      - nginx
-      - htop
-      - gdb
--- a/playbooks/group_vars/all/02_patching.yml
+++ b/playbooks/group_vars/all/02_patching.yml
@@ -8,7 +8,14 @@ patching:
  playbook: "playbooks/02_patching.yml"
  credential: "Workshop Credential"
  survey_enabled: yes
-  survey_spec: "{{survey_patching}}"
+  survey_spec:
+    name: ''
+    description: ''
+    spec:
+    - question_name: 'Enter host to configure'
+      type: text
+      variable: HOSTS
+      required: false
  project:
    name: "Ansible official demo project"
    description: "prescriptive demos from Red Hat Management Buisness Unit"
@@ -18,11 +25,3 @@ patching:
  workshop_type:
    - f5
    - rhel
-survey_patching:
-  name: ''
-  description: ''
-  spec:
-  - question_name: 'Enter host to configure'
-    type: text
-    variable: HOSTS
-    required: false
--- a/playbooks/group_vars/all/03_hardening.yml
+++ b/playbooks/group_vars/all/03_hardening.yml
@@ -8,7 +8,42 @@ hardening:
  playbook: "playbooks/03_hardening.yml"
  credential: "Workshop Credential"
  survey_enabled: yes
-  survey_spec: "{{survey_hardening}}"
+  survey_spec:
+    name: ''
+    description: ''
+    spec:
+    - question_name: 'Enter host to configure'
+      type: text
+      variable: HOSTS
+      required: false
+    - question_name: Configure Firewall?
+      type: multiplechoice
+      variable: harden_firewall
+      required: false
+      choices:
+        - 'Yes'
+        - 'No'
+    - question_name: Configure Time?
+      type: multiplechoice
+      variable: harden_time
+      required: false
+      choices:
+        - 'Yes'
+        - 'No'
+    - question_name: Harden SSH?
+      type: multiplechoice
+      variable: harden_ssh
+      required: false
+      choices:
+        - 'Yes'
+        - 'No'
+    - question_name: PCI Baseline?
+      type: multiplechoice
+      variable: harden_pci
+      required: false
+      choices:
+        - 'Yes'
+        - 'No'
  project:
    name: "Ansible official demo project"
    description: "prescriptive demos from Red Hat Management Buisness Unit"
@@ -18,39 +53,3 @@ hardening:
  workshop_type:
    - f5
    - rhel
-survey_hardening:
-  name: ''
-  description: ''
-  spec:
-  - question_name: 'Enter host to configure'
-    type: text
-    variable: HOSTS
-    required: false
-  - question_name: Configure Firewall?
-    type: multiplechoice
-    variable: harden_firewall
-    required: false
-    choices:
-      - 'Yes'
-      - 'No'
-  - question_name: Configure Time?
-    type: multiplechoice
-    variable: harden_time
-    required: false
-    choices:
-      - 'Yes'
-      - 'No'
-  - question_name: Harden SSH?
-    type: multiplechoice
-    variable: harden_ssh
-    required: false
-    choices:
-      - 'Yes'
-      - 'No'
-  - question_name: PCI Baseline?
-    type: multiplechoice
-    variable: harden_pci
-    required: false
-    choices:
-      - 'Yes'
-      - 'No'
--- a/roles/generate_readme/templates/readme.j2
+++ b/roles/generate_readme/templates/readme.j2
@@ -26,7 +26,8 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
    <th>Video Walkthrough</th>
    <th>Workshop Types</th>
  </tr>
-{% for key, value in demos.items()|sort(attribute='1.name') %}
+
+{% for key, value in hostvars[inventory_hostname].items()|rejectattr('0', 'match', 'ansible_')|selectattr('1.name', 'defined') %}
  <tr>
    <td>{{value.name}}</td>
    <td>{{value.author}}</td>