From 9e63477254ef7420d141d94a4aff246055d5518f Mon Sep 17 00:00:00 2001
From: willtome <willtome@gmail.com>
Date: Wed, 23 Mar 2022 16:33:14 -0400
Subject: [PATCH] update patch report

---
 .../roles/patch_linux/defaults/main.yml       |   3 ++
 .../patching/roles/patch_linux/tasks/main.yml |  36 ++++++++++++++++++
 .../README.md                                 |   0
 .../defaults/main.yml                         |   0
 .../Ansible Linux Automation Report.png       | Bin
 .../files/css/new.css                         |   0
 .../files/redhat-ansible-logo.svg             |   0
 .../files/server.png                          | Bin
 .../files/webpage_logo.png                    | Bin
 .../tasks/main.yml                            |   0
 .../templates/header.j2                       |   0
 .../templates/packages.j2                     |   0
 .../templates/report.j2                       |   0
 .../templates/services.j2                     |   0
 .../vars/main.yml                             |   0
 .../README.md                                 |   0
 .../defaults/main.yml                         |   0
 .../example_results/Full_Report.png           | Bin
 .../Splunk Patching Aggregated RHEL 8.png     | Bin
 .../files/css/main.css                        |   0
 .../files/webpage_logo.png                    | Bin
 .../tasks/main.yml                            |   0
 .../templates/report.j2                       |  14 +++----
 .../vars/main.yml                             |   0
 linux/patching_report.yml                     |  18 +++------
 25 files changed, 51 insertions(+), 20 deletions(-)
 create mode 100644 collections/ansible_collections/demo/patching/roles/patch_linux/defaults/main.yml
 create mode 100644 collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/README.md (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/defaults/main.yml (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/example_results/Ansible Linux Automation Report.png (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/files/css/new.css (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/files/redhat-ansible-logo.svg (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/files/server.png (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/files/webpage_logo.png (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/tasks/main.yml (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/templates/header.j2 (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/templates/packages.j2 (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/templates/report.j2 (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/templates/services.j2 (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux => report_linux}/vars/main.yml (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/README.md (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/defaults/main.yml (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/example_results/Full_Report.png (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/example_results/Splunk Patching Aggregated RHEL 8.png (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/files/css/main.css (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/files/webpage_logo.png (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/tasks/main.yml (100%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/templates/report.j2 (85%)
 rename collections/ansible_collections/demo/patching/roles/{build_report_linux_patch => report_linux_patching}/vars/main.yml (100%)

diff --git a/collections/ansible_collections/demo/patching/roles/patch_linux/defaults/main.yml b/collections/ansible_collections/demo/patching/roles/patch_linux/defaults/main.yml
new file mode 100644
index 0000000..04bf772
--- /dev/null
+++ b/collections/ansible_collections/demo/patching/roles/patch_linux/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+exclude_packages: []
+allow_reboot: true
\ No newline at end of file
diff --git a/collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml b/collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml
new file mode 100644
index 0000000..faa01ec
--- /dev/null
+++ b/collections/ansible_collections/demo/patching/roles/patch_linux/tasks/main.yml
@@ -0,0 +1,36 @@
+---
+- name: Scan packages
+  demo.patching.scan_packages:
+    os_family: "{{ ansible_os_family }}"
+
+- name: Scan services
+  demo.patching.scan_services:
+
+- name: upgrade packages (yum)
+  yum:
+    name: '*'
+    state: latest
+    exclude: "{{ exclude_packages }}"
+  when: ansible_pkg_mgr == "yum"
+  register: patchingresult_yum
+
+- name: upgrade packages (dnf)
+  ansible.builtin.dnf:
+    name: '*'
+    state: latest
+    exclude: "{{ exclude_packages }}"
+  when: ansible_pkg_mgr == "dnf"
+  register: patchingresult_dnf
+
+- name: Check to see if we need a reboot
+  ansible.builtin.command: needs-restarting -r
+  register: result
+  changed_when: result.rc == 1
+  failed_when: result.rc > 1
+  check_mode: no
+
+- name: Reboot Server if Necessary
+  ansible.builtin.reboot:
+  when:
+   - result.rc == 1
+   - allow_reboot is true
\ No newline at end of file
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/README.md b/collections/ansible_collections/demo/patching/roles/report_linux/README.md
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/README.md
rename to collections/ansible_collections/demo/patching/roles/report_linux/README.md
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/defaults/main.yml b/collections/ansible_collections/demo/patching/roles/report_linux/defaults/main.yml
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/defaults/main.yml
rename to collections/ansible_collections/demo/patching/roles/report_linux/defaults/main.yml
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/example_results/Ansible Linux Automation Report.png b/collections/ansible_collections/demo/patching/roles/report_linux/example_results/Ansible Linux Automation Report.png
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/example_results/Ansible Linux Automation Report.png
rename to collections/ansible_collections/demo/patching/roles/report_linux/example_results/Ansible Linux Automation Report.png
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/files/css/new.css b/collections/ansible_collections/demo/patching/roles/report_linux/files/css/new.css
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/files/css/new.css
rename to collections/ansible_collections/demo/patching/roles/report_linux/files/css/new.css
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/files/redhat-ansible-logo.svg b/collections/ansible_collections/demo/patching/roles/report_linux/files/redhat-ansible-logo.svg
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/files/redhat-ansible-logo.svg
rename to collections/ansible_collections/demo/patching/roles/report_linux/files/redhat-ansible-logo.svg
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/files/server.png b/collections/ansible_collections/demo/patching/roles/report_linux/files/server.png
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/files/server.png
rename to collections/ansible_collections/demo/patching/roles/report_linux/files/server.png
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/files/webpage_logo.png b/collections/ansible_collections/demo/patching/roles/report_linux/files/webpage_logo.png
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/files/webpage_logo.png
rename to collections/ansible_collections/demo/patching/roles/report_linux/files/webpage_logo.png
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/tasks/main.yml b/collections/ansible_collections/demo/patching/roles/report_linux/tasks/main.yml
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/tasks/main.yml
rename to collections/ansible_collections/demo/patching/roles/report_linux/tasks/main.yml
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/templates/header.j2 b/collections/ansible_collections/demo/patching/roles/report_linux/templates/header.j2
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/templates/header.j2
rename to collections/ansible_collections/demo/patching/roles/report_linux/templates/header.j2
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/templates/packages.j2 b/collections/ansible_collections/demo/patching/roles/report_linux/templates/packages.j2
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/templates/packages.j2
rename to collections/ansible_collections/demo/patching/roles/report_linux/templates/packages.j2
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/templates/report.j2 b/collections/ansible_collections/demo/patching/roles/report_linux/templates/report.j2
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/templates/report.j2
rename to collections/ansible_collections/demo/patching/roles/report_linux/templates/report.j2
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/templates/services.j2 b/collections/ansible_collections/demo/patching/roles/report_linux/templates/services.j2
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/templates/services.j2
rename to collections/ansible_collections/demo/patching/roles/report_linux/templates/services.j2
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux/vars/main.yml b/collections/ansible_collections/demo/patching/roles/report_linux/vars/main.yml
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux/vars/main.yml
rename to collections/ansible_collections/demo/patching/roles/report_linux/vars/main.yml
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/README.md b/collections/ansible_collections/demo/patching/roles/report_linux_patching/README.md
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/README.md
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/README.md
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/defaults/main.yml b/collections/ansible_collections/demo/patching/roles/report_linux_patching/defaults/main.yml
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/defaults/main.yml
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/defaults/main.yml
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/example_results/Full_Report.png b/collections/ansible_collections/demo/patching/roles/report_linux_patching/example_results/Full_Report.png
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/example_results/Full_Report.png
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/example_results/Full_Report.png
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/example_results/Splunk Patching Aggregated RHEL 8.png b/collections/ansible_collections/demo/patching/roles/report_linux_patching/example_results/Splunk Patching Aggregated RHEL 8.png
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/example_results/Splunk Patching Aggregated RHEL 8.png
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/example_results/Splunk Patching Aggregated RHEL 8.png
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/files/css/main.css b/collections/ansible_collections/demo/patching/roles/report_linux_patching/files/css/main.css
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/files/css/main.css
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/files/css/main.css
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/files/webpage_logo.png b/collections/ansible_collections/demo/patching/roles/report_linux_patching/files/webpage_logo.png
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/files/webpage_logo.png
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/files/webpage_logo.png
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/tasks/main.yml b/collections/ansible_collections/demo/patching/roles/report_linux_patching/tasks/main.yml
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/tasks/main.yml
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/tasks/main.yml
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/templates/report.j2 b/collections/ansible_collections/demo/patching/roles/report_linux_patching/templates/report.j2
similarity index 85%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/templates/report.j2
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/templates/report.j2
index d6ff33c..b6ccab9 100644
--- a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/templates/report.j2
+++ b/collections/ansible_collections/demo/patching/roles/report_linux_patching/templates/report.j2
@@ -35,17 +35,17 @@
             <td>{{hostvars[linux_host]['ansible_distribution_version']|default("none")}}</td>
             <td>
               <ul>
-{% if hostvars[linux_host].patchingresult.changed|default("false",true) == true %}
-{% for packagename in hostvars[linux_host].patchingresult.changes.updated|sort %}
+{% if hostvars[linux_host].patchingresult_yum.changed|default("false",true) == true %}
+{% for packagename in hostvars[linux_host].patchingresult_yum.changes.updated|sort %}
         <li> {{ packagename[0] }} - {{ packagename[1] }} </li>
 {% endfor %}
-{% elif hostvars[linux_host].patchingresultdnf.changed|default("false",true) == true %}
-{% for packagename in hostvars[linux_host].patchingresultdnf.results|sort %}
+{% elif hostvars[linux_host].patchingresult_dnf.changed|default("false",true) == true %}
+{% for packagename in hostvars[linux_host].patchingresult_dnf.results|sort %}
         <li> {{ packagename }} </li>
 {% endfor %}
-{% elif hostvars[linux_host].patchingresultdnf.changed is undefined %}
+{% elif hostvars[linux_host].patchingresult_dnf.changed is undefined %}
         <li> Patching Failed </li>
-{% elif hostvars[linux_host].patchingresult.changed is undefined %}
+{% elif hostvars[linux_host].patchingresult_yum.changed is undefined %}
         <li> Patching Failed </li>
 {% else %}
         <li> Compliant </li>
@@ -56,9 +56,7 @@
 {% endfor %}
     </tbody>
 </table>
-{% for host in ansible_play_hosts %}
 <center><p>Created with Ansible on {{hostvars[host].ansible_date_time.iso8601}}</p></center>
-{% endfor %}
 <script type="text/javascript">
 function tableToCSV() {
 
diff --git a/collections/ansible_collections/demo/patching/roles/build_report_linux_patch/vars/main.yml b/collections/ansible_collections/demo/patching/roles/report_linux_patching/vars/main.yml
similarity index 100%
rename from collections/ansible_collections/demo/patching/roles/build_report_linux_patch/vars/main.yml
rename to collections/ansible_collections/demo/patching/roles/report_linux_patching/vars/main.yml
diff --git a/linux/patching_report.yml b/linux/patching_report.yml
index 713d7ba..a8586f6 100644
--- a/linux/patching_report.yml
+++ b/linux/patching_report.yml
@@ -5,30 +5,24 @@
     report_server: node1
   
   tasks:
-  - name: Ensure Unix/Linux platforms only
-    assert:
-      that: ansible_os_family != "Windows"
-
-  - name: Scan packages (Unix/Linux)
-    demo.patching.scan_packages:
-      os_family: "{{ ansible_os_family }}"
-
-  - name: Scan services (Unix/Linux)
-    demo.patching.scan_services:
+  - include_role:
+      name: demo.patching.patch_linux
 
   - block:
     - yum:
         name: httpd
         state: latest
+      check_mode: no
 
     - service:
         name: httpd
         state: started
+      check_mode: no
 
     - include_role:
-        name: demo.patching.build_report_linux
+        name: demo.patching.report_linux
 
     - include_role:
-        name: demo.patching.build_report_linux_patch
+        name: demo.patching.report_linux_patch
     delegate_to: "{{ report_server }}"
     run_once: yes
\ No newline at end of file