warn control count updates

Signed-off-by: Mark Bolwell <mark.bollyuk@gmail.com>

tasks/section_1/cis_1.1.2.x.yml

@@ -4,26 +4,15 @@
   block:
       - name: "1.1.2.1 | PATCH | Ensure /tmp is a separate partition | Absent"
         ansible.builtin.debug:
-            msg: "Warning!! /tmp is not mounted on a separate partition"
-        when:
-            - required_mount not in mount_names
+            msg: "Warning!! {{ required_mount }} doesn't exist. This is a manual task"
 
-      - name: "1.1.2.1 | PATCH | Ensure /tmp is a separate partition | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.1.2.1' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
-        when:
-            - required_mount not in mount_names
-
-      - name: "1.1.2.1 | AUDIT | Ensure separate partition exists for /var | Present"
-        ansible.builtin.debug:
-            msg: "Congratulations: {{ required_mount }} exists."
-        register: var_mount_present
-        when:
-            - required_mount in mount_names
+      - name: "1.1.2.1 | PATCH | Ensure /tmp is a separate partition | warning"
+        ansible.builtin.import_tasks: warning_facts.yml
   vars:
+      warn_control_id: '1.1.2.1'
       required_mount: '/tmp'
   when:
+      - required_mount not in mount_names
       - rhel9cis_rule_1_1_2_1
   tags:
       - level1-server

tasks/section_1/cis_1.1.3.x.yml

@@ -5,27 +5,14 @@
       - name: "1.1.3.1 | AUDIT | Ensure separate partition exists for /var | Absent"
         ansible.builtin.debug:
             msg: "Warning!! {{ required_mount }} doesn't exist. This is a manual task"
-        register: var_mount_absent
-        changed_when: var_mount_absent.skipped is undefined
-        when:
-            - required_mount not in mount_names
 
-      - name: "1.1.3.1 | AUDIT | Ensure separate partition exists for /var | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.1.3.1' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
-        when:
-            - required_mount not in mount_names
-
-      - name: "1.1.3.1 | AUDIT | Ensure separate partition exists for /var | Present"
-        ansible.builtin.debug:
-            msg: "Congratulations: {{ required_mount }} exists."
-        register: var_mount_present
-        when:
-            - required_mount in mount_names
+      - name: "1.1.3.1 | AUDIT | Ensure separate partition exists for /var | warning"
+        ansible.builtin.import_tasks: warning_facts.yml
   vars:
+      warn_control_id: '1.1.3.1'
       required_mount: '/var'
   when:
+      - required_mount not in mount_names
       - rhel9cis_rule_1_1_3_1
   tags:
       - level2-server

tasks/section_1/cis_1.1.4.x.yml

@@ -6,27 +6,14 @@
       - name: "1.1.4.1 | AUDIT | Ensure separate partition exists for /var/tmp | Absent"
         ansible.builtin.debug:
             msg: "Warning!! {{ required_mount }} doesn't exist. This is a manual task"
-        register: var_tmp_mount_absent
-        changed_when: var_tmp_mount_absent.skipped is undefined
-        when:
-            - required_mount not in mount_names
 
-      - name: "1.1.4.1 | AUDIT | Ensure separate partition exists for /var/tmp | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.1.4.1' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
-        when:
-            - required_mount not in mount_names
-
-      - name: "1.1.4.1 | AUDIT | Ensure separate partition exists for /var/tmp | Present"
-        ansible.builtin.debug:
-            msg: "Congratulations: {{ required_mount }} exists."
-        register: var_tmp_mount_present
-        when:
-            - required_mount in mount_names
+      - name: "1.1.4.1 | AUDIT | Ensure separate partition exists for /var/tmp | Absent"
+        ansible.builtin.import_tasks: warning_facts.yml
   vars:
+      warn_control_id: '1.1.4.1'
       required_mount: '/var/tmp'
   when:
+      - required_mount not in mount_names
       - rhel9cis_rule_1_1_4_1
   tags:
       - level2-server

tasks/section_1/cis_1.1.5.x.yml

@@ -5,27 +5,15 @@
       - name: "1.1.5.1 | AUDIT | Ensure separate partition exists for /var/log | Absent"
         ansible.builtin.debug:
             msg: "Warning!! {{ required_mount }} doesn't exist. This is a manual task"
-        register: var_log_mount_absent
-        changed_when: var_log_mount_absent.skipped is undefined
-        when:
-            - required_mount not in mount_names
-
-      - name: "1.1.5.1 | AUDIT | Ensure separate partition exists for /var/log | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.1.5.1' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
-        when:
-            - required_mount not in mount_names
 
       - name: "1.1.5.1 | AUDIT | Ensure separate partition exists for /var/log | Present"
-        ansible.builtin.debug:
-            msg: "Congratulations: {{ required_mount }} exists."
-        register: var_log_mount_present
-        when:
-            - required_mount in mount_names
+        ansible.builtin.import_tasks: warning_facts.yml
+
   vars:
+      warn_control_id: '1.1.5.1'
       required_mount: '/var/log'
   when:
+      - required_mount not in mount_names
       - rhel9cis_rule_1_1_5_1
   tags:
       - level2-server

tasks/section_1/cis_1.1.6.x.yml

@@ -5,27 +5,15 @@
       - name: "1.1.6.1 | AUDIT | Ensure separate partition exists for /var/log/audit | Absent"
         ansible.builtin.debug:
             msg: "Warning!! {{ required_mount }} doesn't exist. This is a manual task"
-        register: var_log_audit_mount_absent
-        changed_when: var_log_audit_mount_absent.skipped is undefined
-        when:
-            - required_mount not in mount_names
-
-      - name: "1.1.6.1 | AUDIT | Ensure separate partition exists for /var/log/audit | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.1.6.1' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
-        when:
-            - required_mount not in mount_names
 
       - name: "1.1.6.1 | AUDIT | Ensure separate partition exists for /var/log/audit | Present"
-        ansible.builtin.debug:
-            msg: "Congratulations: {{ required_mount }} exists."
-        register: var_log_audit_mount_present
-        when:
-            - required_mount in mount_names
+        ansible.builtin.import_tasks: warning_facts.yml
+
   vars:
-      required_mount: '/var/log/audit'
+       warn_control_id: '1.1.6.1'
+       required_mount: '/var/log/audit'
   when:
+      - required_mount not in mount_names
       - rhel9cis_rule_1_1_6_1
   tags:
       - level2-server

tasks/section_1/cis_1.1.7.x.yml

@@ -5,27 +5,15 @@
       - name: "1.1.7.1 | AUDIT | Ensure separate partition exists for /home | Absent"
         ansible.builtin.debug:
             msg: "Warning!! {{ required_mount }} doesn't exist. This is a manual task"
-        register: home_mount_absent
-        changed_when: home_mount_absent.skipped is undefined
-        when:
-            - required_mount not in mount_names
-
-      - name: "1.1.7.1 | AUDIT | Ensure separate partition exists for /home | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.1.7.1' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
-        when:
-            - required_mount not in mount_names
 
       - name: "1.1.7.1 | AUDIT | Ensure separate partition exists for /home | Present"
-        ansible.builtin.debug:
-            msg: "Congratulations: {{ required_mount }} exists."
-        register: home_mount_present
-        when:
-            - required_mount in mount_names
+        ansible.builtin.import_tasks: warning_facts.yml
+        vars:
+            warn_control_id: '1.1.7.1'
   vars:
       required_mount: '/home'
   when:
+      - required_mount not in mount_names
       - rhel9cis_rule_1_1_7_1
   tags:
       - level2-server

tasks/section_1/cis_1.1.8.x.yml

@@ -6,27 +6,15 @@
       - name: "1.1.8.1 | AUDIT | Ensure /dev/shm is a separate partition | Absent"
         ansible.builtin.debug:
             msg: "Warning!! {{ required_mount }} doesn't exist. This is a manual task"
-        register: home_mount_absent
-        changed_when: home_mount_absent.skipped is undefined
-        when:
-            - required_mount not in mount_names
-
-      - name: "1.1.8.1 | AUDIT | Ensure separate partition exists for /home | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.1.8.1' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
-        when:
-            - required_mount not in mount_names
 
       - name: "1.1.8.1 | AUDIT | Ensure separate partition exists for /home | Present"
-        ansible.builtin.debug:
-            msg: "Congratulations: {{ required_mount }} exists."
-        register: home_mount_present
-        when:
-            - required_mount in mount_names
+        ansible.builtin.import_tasks: warning_facts.yml
+
   vars:
+      warn_control_id: '1.1.8.1'
       required_mount: '/dev/shm'
   when:
+      - required_mount not in mount_names
       - rhel9cis_rule_1_1_8_1
   tags:
       - level1-server

tasks/section_1/cis_1.2.x.yml

@@ -81,9 +81,9 @@
                 - "{{ dnf_configured.stdout_lines }}"
 
       - name: "1.2.3 | AUDIT | Ensure package manager repositories are configured | Warn Count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + ['rule_1.2.3']"
-            warn_count: "{{ warn_count | int + 1 }}"
+        ansible.builtin.import_tasks: warning_facts.yml
+  vars:
+      warn_control_id: '1.2.3'
   when:
       - rhel9cis_rule_1_2_3
   tags:

tasks/section_1/cis_1.6.1.x.yml

@@ -91,21 +91,16 @@
         failed_when: false
         changed_when: false
 
-      - name: "1.6.1.6 | AUDIT | Ensure no unconfined services exist | Message on no unconfined services"
-        ansible.builtin.debug:
-            msg: "Good News! There are no services found on your system"
-        when: rhelcis_1_6_1_6_unconf_services.stdout | length == 0
-
       - name: "1.6.1.6 | AUDIT | Ensure no unconfined services exist | Message on unconfined services"
         ansible.builtin.debug:
             msg: "Warning!! You have unconfined services: {{ rhelcis_1_6_1_5_unconf_services.stdout_lines }}"
         when: rhelcis_1_6_1_6_unconf_services.stdout | length > 0
 
       - name: "1.6.1.6 | AUDIT | Ensure no unconfined services exist | warning count"
-        ansible.builtin.set_fact:
-            control_number: "{{ control_number }} + [ 'rule_1.6.1.5' ]"
-            warn_count: "{{ warn_count | int + 1 }}"
+        ansible.builtin.import_tasks: warning_facts.yml
         when: rhelcis_1_6_1_6_unconf_services.stdout | length > 0
+  vars:
+      warn_control_id: '1.6.1.6'
   when:
       - rhel9cis_rule_1_6_1_6
   tags: