fixing more tests before EOD

README.md

@@ -20,57 +20,51 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
 <table>
   <tr>
     <th>Demo Name</th>
+    <th>Author</th>
     <th>install_demo.yml value</th>
     <th>Description</th>
     <th>Video Walkthrough</th>
     <th>Workshop Types</th>
   </tr>
   <tr>
-    <td>Deploy Application</td>
+    <td>Windows IIS Server</td>
-    <td><pre>demo: deploy_application</pre></td>
+    <td>Colin McNaughton</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&index=1">Youtube Video</a></td>
-    <td>
-    <ul>
-    <li>f5</li>
-    <li>rhel</li>
-    </ul>
-    </td>
-  </tr>
-  <tr>
-    <td>Windows Webserver</td>
     <td><pre>demo: windows_iis</pre></td>
-    <td>survey to install webserver on Windows Server</td>
+    <td>install webserver on Windows Server with a survey</td>
-    <td>Not Available</td>
+    <td>Not available </td>
-    <td>
+    <td><ul><li>windows</li></ul></td>
-    <ul>
-    <li>windows</li>
-    </ul>
-    </td>
   </tr>
   <tr>
-    <td>Openscap</td>
+    <td>Create Developer Report</td>
-    <td><pre>demo: openscap</pre></td>
+    <td>Sean Cavanaugh</td>
-    <td>Create HTML report using SCAP Security Guide (SSG)</td>
-    <td>Not Available</td>
-    <td>
-    <ul>
-    <li>f5</li>
-    <li>rhel</li>
-    </ul>
-    </td>
-  </tr>
-  <tr>
-    <td>Developer Report</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>Not available </td>
-    <td>
+    <td><ul><li>f5</li><li>rhel</li></ul></td>
-    <ul>
+  </tr>
-    <li>f5</li>
+  <tr>
-    <li>rhel</li>
+    <td>Deploy Application (survey)</td>
-    </ul>
+    <td>Sean Cavanaugh</td>
-    </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 Openscap Report</td>
+    <td>Sean Cavanaugh</td>
+    <td><pre>demo: openscap</pre></td>
+    <td>Create HTML report using SCAP Security Guide (SSG)</td>
+    <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>
 </table>
 

playbooks/02_patching.yml

@@ -5,7 +5,7 @@
   gather_facts: no
 
   tasks:
-  - name: upgrade all pacakges except kernel
+  - name: upgrade all packages except kernel
     yum:
       name: '*'
       state: latest

playbooks/test.md

@@ -1,73 +0,0 @@
-# Official Ansible Product Demos
-
-this is currently under construction and working on a minimal viable demo for testing purposes
-
-# How to use
-
-## 1. Provide login information and choose demo
-
-  - Modify the `choose_demo.yml` file that is included in this repo with the username, password and IP address (or DNS name) of your Ansible Tower
-  - Choose the demo name you want from the table below (or choose `all`)
-
-## 2. Run Ansible Playbook
-
-```
-ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
-```
-
-# Demo Repository
-
-<table>
-  <tr>
-    <th>Demo Name</th>
-    <th>Author</th>
-    <th>install_demo.yml value</th>
-    <th>Description</th>
-    <th>Video Walkthrough</th>
-    <th>Workshop Types</th>
-  </tr>
-  <tr>
-    <td>Windows IIS Server</td>
-    <td>Colin McNaughton</td>
-    <td><pre>demo: windows_iis</pre></td>
-    <td>install webserver on Windows Server with a survey</td>
-    <td>Not available </td>
-    <td><ul><li>windows</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>
-  <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 Openscap Report</td>
-    <td>Sean Cavanaugh</td>
-    <td><pre>demo: openscap</pre></td>
-    <td>Create HTML report using SCAP Security Guide (SSG)</td>
-    <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>
-</table>
-
-# Contribute
-
-please refer to the [contribute.md](docs/contribute.md) documentation included in this collection.

roles/generate_readme/tasks/main.yml

@@ -2,4 +2,4 @@
 - name: create readme
   template:
     src: readme.j2
-    dest: "{{playbook_dir}}/test.md"
+    dest: "../README.md"

roles/install_demo/tasks/add_job_template.yml

@@ -1,10 +1,10 @@
 - name: add tower project
   tower_project:
-    name: "{{project.my_name}}"
+    name: "{{item.value.project.name}}"
-    description: "{{project.my_description}}"
+    description: "{{item.value.project.description}}"
-    organization: "{{project.my_organization}}"
+    organization: "{{item.value.project.organization}}"
-    scm_type: "{{project.my_scm_type}}"
+    scm_type: "{{item.value.project.scm_type}}"
-    scm_url: "{{project.my_scm_url}}"
+    scm_url: "{{item.value.project.scm_url}}"
     tower_username: "{{my_tower_username}}"
     tower_password: "{{my_tower_password}}"
     tower_host: "{{my_tower_host}}"
@@ -16,7 +16,7 @@
     description: "{{item.value.description}}"
     job_type: "{{item.value.job_type}}"
     inventory: "{{item.value.inventory}}"
-    project: "{{item.value.project}}"
+    project: "{{item.value.project.name}}"
     playbook: "{{item.value.playbook}}"
     credential: "{{item.value.credential}}"
     survey_enabled: "{{item.value.survey_enabled}}"
@@ -33,7 +33,7 @@
     description: "{{item.value.description}}"
     job_type: "{{item.value.job_type}}"
     inventory: "{{item.value.inventory}}"
-    project: "{{item.value.project}}"
+    project: "{{item.value.project.name}}"
     playbook: "{{item.value.playbook}}"
     credential: "{{item.value.credential}}"
     survey_enabled: "{{item.value.survey_enabled}}"

roles/install_demo/tasks/single_job_template.yml

@@ -16,7 +16,7 @@
     description: "{{demos[demo].description}}"
     job_type: "{{demos[demo].job_type}}"
     inventory: "{{demos[demo].inventory}}"
-    project: "{{demos[demo].project}}"
+    project: "{{demos[demo].project.name}}"
     playbook: "{{demos[demo].playbook}}"
     credential: "{{demos[demo].credential}}"
     survey_enabled: "{{demos[demo].survey_enabled}}"
@@ -33,7 +33,7 @@
     description: "{{demos[demo].description}}"
     job_type: "{{demos[demo].job_type}}"
     inventory: "{{demos[demo].inventory}}"
-    project: "{{demos[demo].project}}"
+    project: "{{demos[demo].project.name}}"
     playbook: "{{demos[demo].playbook}}"
     credential: "{{demos[demo].credential}}"
     survey_enabled: "{{demos[demo].survey_enabled}}"