diff --git a/README.md b/README.md
index 11d17ea..0165b74 100644
--- a/README.md
+++ b/README.md
@@ -20,57 +20,51 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
| Demo Name |
+ Author |
install_demo.yml value |
Description |
Video Walkthrough |
Workshop Types |
- | Deploy Application |
- demo: deploy_application |
- install yum applications on Linux with a survey |
- Youtube Video |
-
-
- |
-
-
- | Windows Webserver |
+ Windows IIS Server |
+ Colin McNaughton |
demo: windows_iis |
- survey to install webserver on Windows Server |
- Not Available |
-
-
- |
+ install webserver on Windows Server with a survey |
+ Not available |
+ |
- | Openscap |
- demo: openscap |
- Create HTML report using SCAP Security Guide (SSG) |
- Not Available |
-
-
- |
-
-
- | Developer Report |
+ Create Developer Report |
+ Sean Cavanaugh |
demo: developer_report |
Create HTML report using Ansible facts |
- Not Available |
-
-
- |
+ Not available |
+ |
+
+
+ | Deploy Application (survey) |
+ Sean Cavanaugh |
+ demo: deploy_application |
+ install yum applications on Linux with a survey |
+ Video Link |
+ |
+
+
+ | Create Openscap Report |
+ Sean Cavanaugh |
+ demo: openscap |
+ Create HTML report using SCAP Security Guide (SSG) |
+ Not available |
+ |
+
+
+ | SERVER / Patching |
+ Will Tome |
+ demo: patching |
+ patching for Linux servers |
+ Not available |
+ |
diff --git a/playbooks/02_patching.yml b/playbooks/02_patching.yml
index 568d9d6..67d6e15 100644
--- a/playbooks/02_patching.yml
+++ b/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
diff --git a/playbooks/test.md b/playbooks/test.md
deleted file mode 100644
index 0165b74..0000000
--- a/playbooks/test.md
+++ /dev/null
@@ -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
-
-
-
- | Demo Name |
- Author |
- install_demo.yml value |
- Description |
- Video Walkthrough |
- Workshop Types |
-
-
- | Windows IIS Server |
- Colin McNaughton |
- demo: windows_iis |
- install webserver on Windows Server with a survey |
- Not available |
- |
-
-
- | Create Developer Report |
- Sean Cavanaugh |
- demo: developer_report |
- Create HTML report using Ansible facts |
- Not available |
- |
-
-
- | Deploy Application (survey) |
- Sean Cavanaugh |
- demo: deploy_application |
- install yum applications on Linux with a survey |
- Video Link |
- |
-
-
- | Create Openscap Report |
- Sean Cavanaugh |
- demo: openscap |
- Create HTML report using SCAP Security Guide (SSG) |
- Not available |
- |
-
-
- | SERVER / Patching |
- Will Tome |
- demo: patching |
- patching for Linux servers |
- Not available |
- |
-
-
-
-# Contribute
-
-please refer to the [contribute.md](docs/contribute.md) documentation included in this collection.
diff --git a/roles/generate_readme/tasks/main.yml b/roles/generate_readme/tasks/main.yml
index 062a711..5241b7d 100644
--- a/roles/generate_readme/tasks/main.yml
+++ b/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"
diff --git a/roles/install_demo/tasks/add_job_template.yml b/roles/install_demo/tasks/add_job_template.yml
index 6fa3a20..9550789 100644
--- a/roles/install_demo/tasks/add_job_template.yml
+++ b/roles/install_demo/tasks/add_job_template.yml
@@ -1,10 +1,10 @@
- name: add tower project
tower_project:
- name: "{{project.my_name}}"
- description: "{{project.my_description}}"
- organization: "{{project.my_organization}}"
- scm_type: "{{project.my_scm_type}}"
- scm_url: "{{project.my_scm_url}}"
+ name: "{{item.value.project.name}}"
+ description: "{{item.value.project.description}}"
+ organization: "{{item.value.project.organization}}"
+ scm_type: "{{item.value.project.scm_type}}"
+ 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}}"
diff --git a/roles/install_demo/tasks/single_job_template.yml b/roles/install_demo/tasks/single_job_template.yml
index 40c3562..bcdc487 100644
--- a/roles/install_demo/tasks/single_job_template.yml
+++ b/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}}"