diff --git a/playbooks/02_patching.yml b/playbooks/02_patching.yml
new file mode 100644
index 0000000..568d9d6
--- /dev/null
+++ b/playbooks/02_patching.yml
@@ -0,0 +1,21 @@
+---
+- name: apply non-kernel updates
+ hosts: "{{ HOSTS | default('all') }}"
+ become: yes
+ gather_facts: no
+
+ tasks:
+ - name: upgrade all pacakges except kernel
+ yum:
+ name: '*'
+ state: latest
+ exclude: kernel*
+ tags: all
+
+ - name: upgrade all packages security related except kernel
+ yum:
+ name: '*'
+ state: latest
+ security: yes
+ exclude: kernel*
+ tags: security
diff --git a/playbooks/group_vars/all/02_patching.yml b/playbooks/group_vars/all/02_patching.yml
new file mode 100644
index 0000000..ba7a6a2
--- /dev/null
+++ b/playbooks/group_vars/all/02_patching.yml
@@ -0,0 +1,8 @@
+survey_patching:
+ name: ''
+ description: ''
+ spec:
+ - question_name: 'Enter host to configure'
+ type: text
+ variable: HOSTS
+ required: false
diff --git a/playbooks/group_vars/all/all.yml b/playbooks/group_vars/all/all.yml
index 3ad9033..2b17e4f 100644
--- a/playbooks/group_vars/all/all.yml
+++ b/playbooks/group_vars/all/all.yml
@@ -1,10 +1,10 @@
demos:
deploy_application:
+ author: "Sean Cavanaugh"
name: "Deploy Application (survey)"
description: "install yum applications on Linux with a survey"
job_type: "run"
inventory: "Workshop Inventory"
- project: "Ansible official demo project"
playbook: "playbooks/01_deploy_application.yml"
credential: "Workshop Credential"
survey_enabled: yes
@@ -15,16 +15,35 @@ demos:
description: "prescriptive demos from Red Hat Management Buisness Unit"
organization: "Default"
scm_type: git
- github_url: "https://github.com/ansible/product-demos"
+ scm_url: "https://github.com/ansible/product-demos"
+ workshop_type:
+ - f5
+ - rhel
+ patching:
+ author: "Will Tome"
+ name: "SERVER / Patching"
+ description: "patching for Linux servers"
+ job_type: "run"
+ inventory: "Workshop Inventory"
+ playbook: "playbooks/02_patching.yml"
+ credential: "Workshop Credential"
+ survey_enabled: yes
+ survey_spec: "{{survey_patching}}"
+ project:
+ name: "Ansible official demo project"
+ description: "prescriptive demos from Red Hat Management Buisness Unit"
+ organization: "Default"
+ scm_type: git
+ scm_url: "https://github.com/ansible/product-demos"
workshop_type:
- f5
- rhel
windows_iis:
+ author: "Colin McNaughton"
name: "Windows IIS Server"
description: "install webserver on Windows Server with a survey"
job_type: "run"
inventory: "Workshop Inventory"
- project: "Ansible official demo project"
playbook: "playbooks/05_windows_iis.yml"
credential: "Demo Credential"
survey_enabled: no
@@ -33,15 +52,15 @@ demos:
description: "prescriptive demos from Red Hat Management Buisness Unit"
organization: "Default"
scm_type: git
- github_url: "https://github.com/ansible/product-demos"
+ scm_url: "https://github.com/ansible/product-demos"
workshop_type:
- windows
openscap:
+ author: "Sean Cavanaugh"
name: "Create Openscap Report"
description: "Create HTML report using SCAP Security Guide (SSG)"
job_type: "run"
inventory: "Workshop Inventory"
- project: "Ansible official demo project"
playbook: "playbooks/10_openscap.yml"
credential: "Workshop Credential"
survey_enabled: no
@@ -50,16 +69,16 @@ demos:
description: "prescriptive demos from Red Hat Management Buisness Unit"
organization: "Default"
scm_type: git
- github_url: "https://github.com/ansible/product-demos"
+ scm_url: "https://github.com/ansible/product-demos"
workshop_type:
- f5
- rhel
developer_report:
+ author: "Sean Cavanaugh"
name: "Create Developer Report"
description: 'Create HTML report using Ansible facts'
job_type: "run"
inventory: "Workshop Inventory"
- project: "Ansible official demo project"
playbook: "playbooks/11_developer_report.yml"
credential: "Workshop Credential"
survey_enabled: no
@@ -68,7 +87,7 @@ demos:
description: "prescriptive demos from Red Hat Management Buisness Unit"
organization: "Default"
scm_type: git
- github_url: "https://github.com/ansible/product-demos"
+ scm_url: "https://github.com/ansible/product-demos"
workshop_type:
- f5
- rhel
diff --git a/playbooks/test.md b/playbooks/test.md
index 904cd5a..0165b74 100644
--- a/playbooks/test.md
+++ b/playbooks/test.md
@@ -20,6 +20,7 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
| Demo Name |
+ Author |
install_demo.yml value |
Description |
Video Walkthrough |
@@ -27,6 +28,7 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
| Windows IIS Server |
+ Colin McNaughton |
demo: windows_iis |
install webserver on Windows Server with a survey |
Not available |
@@ -34,24 +36,35 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
| Create Developer Report |
+ Sean Cavanaugh |
demo: developer_report |
Create HTML report using Ansible facts |
Not available |
- rhel |
+ |
| Deploy Application (survey) |
+ Sean Cavanaugh |
demo: deploy_application |
install yum applications on Linux with a survey |
Video Link |
- rhel |
+ |
| Create Openscap Report |
+ Sean Cavanaugh |
demo: openscap |
Create HTML report using SCAP Security Guide (SSG) |
Not available |
- rhel |
+ |
+
+
+ | SERVER / Patching |
+ Will Tome |
+ demo: patching |
+ patching for Linux servers |
+ Not available |
+ |
diff --git a/roles/generate_readme/templates/readme.j2 b/roles/generate_readme/templates/readme.j2
index 3190de2..a0d5e69 100644
--- a/roles/generate_readme/templates/readme.j2
+++ b/roles/generate_readme/templates/readme.j2
@@ -20,6 +20,7 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
| Demo Name |
+ Author |
install_demo.yml value |
Description |
Video Walkthrough |
@@ -28,10 +29,11 @@ ansible-playbook playbooks/install_demo.yml -e @choose_demo.yml
{% for key, value in demos.iteritems() %}
| {{value.name}} |
+ {{value.author}} |
demo: {{key}} |
{{value.description}} |
{% if value.video is defined%}Video Link{% else %}Not available {% endif %} |
- {% for workshop in value.workshop_type %}- {{workshop}}
{% endfor %} |
+ {% for workshop in value.workshop_type %}- {{workshop}}
{% endfor %} |
{% endfor %}
diff --git a/roles/install_demo/tasks/single_job_template.yml b/roles/install_demo/tasks/single_job_template.yml
index b267941..40c3562 100644
--- a/roles/install_demo/tasks/single_job_template.yml
+++ b/roles/install_demo/tasks/single_job_template.yml
@@ -1,10 +1,10 @@
- name: add tower project
tower_project:
- name: "{{project.name}}"
- description: "{{project.description}}"
- organization: "{{project.organization}}"
- scm_type: "{{project.scm_type}}"
- scm_url: "{{project.scm_url}}"
+ name: "{{demos[demo].project.name}}"
+ description: "{{demos[demo].project.description}}"
+ organization: "{{demos[demo].project.organization}}"
+ scm_type: "{{demos[demo].project.scm_type}}"
+ scm_url: "{{demos[demo].project.scm_url}}"
tower_username: "{{my_tower_username}}"
tower_password: "{{my_tower_password}}"
tower_host: "{{my_tower_host}}"