From 725b764a8019f926b4eeb41b820ec7f6780ed2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 19 May 2022 11:21:27 -0300
Subject: [PATCH] Instances added to distributed test

---
 molecule/distributed-wazuh/converge.yml | 86 +++++++++----------------
 1 file changed, 29 insertions(+), 57 deletions(-)

diff --git a/molecule/distributed-wazuh/converge.yml b/molecule/distributed-wazuh/converge.yml
index 5033b56a..299fe8a3 100644
--- a/molecule/distributed-wazuh/converge.yml
+++ b/molecule/distributed-wazuh/converge.yml
@@ -86,34 +86,6 @@
     # 1. Wazuh indexer
     - role: ../../roles/wazuh/wazuh-indexer
       when: inventory_hostname in groups['indexer']
-      vars:
-        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.
-            role: indexer
-          node2:
-            name: wazuh-es02
-            ip: "{{ hostvars.molecule_wazuh_indexer_centos7_2.private_ip }}"
-            role: indexer
-#          node3:
-#            name: node-3
-#            ip: "{{ hostvars.wi3.private_ip }}"
-#            role: indexer
-          node4:
-            name: wazuh-mgr01
-            ip: "{{ hostvars.molecule_wazuh_manager_debian9.private_ip }}"
-            role: wazuh
-            node_type: master
-          node5:
-            name: wazuh-mgr02
-            ip: "{{ hostvars.molecule_wazuh_manager_centos7.private_ip }}"
-            role: wazuh
-            node_type: worker
-          node6:
-            name: wazuh-dash01
-            ip: "{{ hostvars.molecule_wazuh_dashboard_centos7.private_ip }}"
-            role: dashboard
     # 2. Managers
     - role: ../../roles/wazuh/ansible-wazuh-manager
       when: inventory_hostname in groups['managers']
@@ -122,36 +94,36 @@
     # 3. Wazuh dashboard
     - role: ../../roles/wazuh/wazuh-dashboard
       when: inventory_hostname in groups['dashboard']
-      vars:
-        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.
-            role: indexer
-          node2:
-            name: wazuh-es02
-            ip: "{{ hostvars.molecule_wazuh_indexer_centos7_2.private_ip }}"
-            role: indexer
-#          node3:
-#            name: node-3
-#            ip: "{{ hostvars.wi3.private_ip }}"
-#            role: indexer
-          node4:
-            name: wazuh-mgr01
-            ip: "{{ hostvars.molecule_wazuh_manager_debian9.private_ip }}"
-            role: wazuh
-            node_type: master
-          node5:
-            name: wazuh-mgr02
-            ip: "{{ hostvars.molecule_wazuh_manager_centos7.private_ip }}"
-            role: wazuh
-            node_type: worker
-          node6:
-            name: wazuh-dash01
-            ip: "{{ hostvars.molecule_wazuh_dashboard_centos7.private_ip }}"
-            role: dashboard
     # 4. Agents:
     - role: ../../roles/wazuh/ansible-wazuh-agent
       vars:
         wazuh_managers: '{{ wazuh_managers_list }}'
-      when: inventory_hostname in groups['agents']
\ No newline at end of file
+      when: inventory_hostname in groups['agents']
+  vars:
+    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.
+        role: indexer
+      node2:
+        name: wazuh-es02
+        ip: "{{ hostvars.molecule_wazuh_indexer_centos7_2.private_ip }}"
+        role: indexer
+#          node3:
+#            name: node-3
+#            ip: "{{ hostvars.wi3.private_ip }}"
+#            role: indexer
+      node4:
+        name: wazuh-mgr01
+        ip: "{{ hostvars.molecule_wazuh_manager_debian9.private_ip }}"
+        role: wazuh
+        node_type: master
+      node5:
+        name: wazuh-mgr02
+        ip: "{{ hostvars.molecule_wazuh_manager_centos7.private_ip }}"
+        role: wazuh
+        node_type: worker
+      node6:
+        name: wazuh-dash01
+        ip: "{{ hostvars.molecule_wazuh_dashboard_centos7.private_ip }}"
+        role: dashboard
\ No newline at end of file