From 3924b0844917b46d7d8e7aee72c92390bfa39639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Wed, 2 Nov 2022 15:16:12 -0300
Subject: [PATCH] CI tests updated

---
 molecule/default/converge.yml           |  6 ++++++
 molecule/distributed-wazuh/converge.yml | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 62c15859..b6f7f2db 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -15,6 +15,12 @@
 - name: ConvergeInstall
   hosts: all
   roles:
+    # 1. Check packages
+    - role: ../../roles/wazuh/check-packages
+      become: no
+      delegate_to: localhost
+      when: "inventory_hostname in {{ groups['indexer'] | first }}"
+    # 2. Managers
     - role: ../../roles/wazuh/ansible-wazuh-manager
       vars:
     - { role: ../../roles/wazuh/ansible-filebeat-oss, filebeat_output_indexer_hosts: "indexer_centos7:9200" }
diff --git a/molecule/distributed-wazuh/converge.yml b/molecule/distributed-wazuh/converge.yml
index 3fd4169a..44f0db53 100644
--- a/molecule/distributed-wazuh/converge.yml
+++ b/molecule/distributed-wazuh/converge.yml
@@ -83,24 +83,25 @@
     - role: ../../roles/wazuh/check-packages
       become: no
       delegate_to: localhost
-    # 1. Wazuh indexer
+      when: "inventory_hostname in {{ groups['indexer'] | first }}"
+    # 2. Wazuh indexer
     - role: ../../roles/wazuh/wazuh-indexer
       when: inventory_hostname in groups['indexer']
-    # 2. Managers
+    # 3. Managers
     - role: ../../roles/wazuh/ansible-wazuh-manager
       when: inventory_hostname in groups['managers']
     - role: ../../roles/wazuh/ansible-filebeat-oss
       when: inventory_hostname in groups['managers']
-    # 3. Wazuh dashboard
+    # 4. Wazuh dashboard
     - role: ../../roles/wazuh/wazuh-dashboard
       when: inventory_hostname in groups['dashboard']
-    # 4. Agents:
+    # 5. Agents:
     - role: ../../roles/wazuh/ansible-wazuh-agent
       vars:
         wazuh_managers: '{{ wazuh_managers_list }}'
       when: inventory_hostname in groups['agents']
   vars:
-    instances: 
+    instances:
       node1:
         name: wazuh-es01       # Important: must be equal to indexer_node_name.
         ip: "{{ hostvars.molecule_wazuh_indexer_centos7.private_ip }}"   # When unzipping, the node will search for its node name folder to get the cert.