agent and manager grouping task

roles/wazuh/ansible-wazuh-agent/tasks/Debian.yml

@@ -22,16 +22,15 @@
     cis_distribution_filename: cis_debian_linux_rcl.txt
   when: ansible_os_family == "Debian"
 
+- when:
+  - wazuh_agent_config.cis_cat.disable == 'no'
+  - wazuh_agent_config.cis_cat.install_java == 'yes'
+  block:
   - name: Debian/Ubuntu | Setting webupd8 repository
     apt_repository:
       repo: 'ppa:webupd8team/java'
       codename: 'xenial'
       update_cache: yes
-  when:
-    - wazuh_agent_config.cis_cat.disable == 'no'
-    - wazuh_agent_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
 
   - name: Debian/Ubuntu | Accept Oracle Java 8 license
     debconf:
@@ -39,20 +38,12 @@
       question: shared/accepted-oracle-license-v1-1
       value: true
       vtype: boolean
-  when:
-    - wazuh_agent_config.cis_cat.disable == 'no'
-    - wazuh_agent_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
 
   - name: Debian/Ubuntu | Oracle Java 8 installer
     apt:
       name: oracle-java8-installer
       state: present
       cache_valid_time: 3600
-  when:
-    - wazuh_agent_config.cis_cat.disable == 'no'
-    - wazuh_agent_config.cis_cat.install_java == 'yes'
   tags:
     - init
 

roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml

@@ -30,16 +30,15 @@
   set_fact:
     cis_distribution_filename: cis_debian_linux_rcl.txt
 
+- when:
+   - wazuh_manager_config.cis_cat.disable == 'no'
+   - wazuh_manager_config.cis_cat.install_java == 'yes'
+  block:
   - name: Debian/Ubuntu | Setting webupd8 repository
     apt_repository:
       repo: 'ppa:webupd8team/java'
       codename: 'xenial'
       update_cache: yes
-  when:
-    - wazuh_manager_config.cis_cat.disable == 'no'
-    - wazuh_manager_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
 
   - name: Debian/Ubuntu | Accept Oracle Java 8 license
     debconf:
@@ -47,20 +46,12 @@
       question: shared/accepted-oracle-license-v1-1
       value: true
       vtype: boolean
-  when:
-    - wazuh_manager_config.cis_cat.disable == 'no'
-    - wazuh_manager_config.cis_cat.install_java == 'yes'
-  tags:
-    - init
 
   - name: Debian/Ubuntu | Oracle Java 8 installer
     apt:
       name: oracle-java8-installer
       state: present
       cache_valid_time: 3600
-  when:
-    - wazuh_manager_config.cis_cat.disable == 'no'
-    - wazuh_manager_config.cis_cat.install_java == 'yes'
   tags:
     - init