Resolve issue #107 to restore network report demo

collections/ansible_collections/demo/patching/roles/build_report_network/tasks/main.yml

@@ -21,17 +21,20 @@
   check_mode: false
 
 - name: Copy logos over
-  ansible.builtin.copy:
-    src: "{{ item }}"
-    dest: "{{ file_path }}"
-    directory_mode: true
-    mode: "0644"
   loop:
     - "webpage_logo.png"
     - "redhat-ansible-logo.svg"
     - "router.png"
+  loop_control:
+    loop_var: logo
+  ansible.builtin.copy:
+    src: "{{ logo }}"
+    dest: "{{ file_path }}"
+    directory_mode: true
+    mode: "0644"
+
   check_mode: false
 
-# - name: Display link to Linux patch report
-#   ansible.builtin.debug:
-#     msg: "Please go to http://{{ hostvars[report_server]['ansible_host'] }}/reports/network.html"
+- name: Display link to Linux patch report
+  ansible.builtin.debug:
+    msg: "Please go to http://{{ hostvars[report_server]['ansible_host'] }}/reports/network.html"

collections/ansible_collections/demo/patching/roles/report_server/tasks/apache.yml

@@ -2,13 +2,13 @@
 - name: Include system variables
   ansible.builtin.include_vars: "{{ ansible_system }}.yml"
 
-- name: Permit traffic in default zone for http service
-  ansible.posix.firewalld:
-    service: http
-    permanent: true
-    state: enabled
-    immediate: true
-  check_mode: false
+# - name: Permit traffic in default zone for http service
+#   ansible.posix.firewalld:
+#     service: http
+#     permanent: true
+#     state: enabled
+#     immediate: true
+#   check_mode: false
 
 - name: Install httpd package
   ansible.builtin.yum:
@@ -30,8 +30,10 @@
     mode: "0644"
   check_mode: false
 
-- name: Install httpd service
+- name: Start httpd service
   ansible.builtin.service:
     name: httpd
     state: started
   check_mode: false
+
+...

network/report.yml

@@ -20,11 +20,11 @@
         gather_network_resources: all
       when: ansible_network_os == 'cisco.nxos.nxos'
 
-    - name: Gather all network resource and minimal legacy facts [Cisco IOS XR]
-      cisco.iosxr.iosxr_facts:
-        gather_subset: min
-        gather_network_resources: all
-      when: ansible_network_os == 'cisco.iosxr.iosxr'
+    # - name: Gather all network resource and minimal legacy facts [Cisco IOS XR]
+    #   cisco.iosxr.iosxr_facts:
+    #     gather_subset: min
+    #     gather_network_resources: all
+    #   when: ansible_network_os == 'cisco.iosxr.iosxr'
 
 #   # The dig lookup requires the python 'dnspython' library
 #   - name: Resolve IP address

network/setup.yml

@@ -15,28 +15,21 @@ controller_projects:
     default_environment: Networking Execution Environment
 
 controller_inventories:
-  - name: Network Inventory
+  - name: Demo Inventory
     organization: Default
 
 controller_inventory_sources:
   - name: DevNet always-on sandboxes
     source: scm
-    inventory: Network Inventory
+    inventory: Demo Inventory
     overwrite: true
     source_project: Network Golden Configs
     source_path: hosts
 
-controller_hosts:
-  - name: node1
-    inventory: Network Inventory
-    variables:
-      ansible_user: rhel
-      ansible_host: node1
-
 controller_templates:
   - name: NETWORK / Configuration
     organization: Default
-    inventory: Network Inventory
+    inventory: Demo Inventory
     survey_enabled: true
     project: Network Golden Configs
     playbook: main.yml
@@ -70,7 +63,7 @@ controller_templates:
   - name: "NETWORK / Report"
     job_type: check
     organization: Default
-    inventory: Network Inventory
+    inventory: Demo Inventory
     project: "Ansible official demo project"
     playbook: "network/report.yml"
     notification_templates_started: Telemetry
@@ -99,7 +92,7 @@ controller_templates:
   - name: "NETWORK / DISA STIG"
     job_type: check
     organization: Default
-    inventory: Network Inventory
+    inventory: Demo Inventory
     project: "Ansible official demo project"
     playbook: "network/compliance.yml"
     notification_templates_started: Telemetry