From 8350a30dacb7960367eafd0003a147ba35d52254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Acu=C3=B1a?= <teddytpc1@gmail.com>
Date: Thu, 19 May 2022 11:09:16 -0300
Subject: [PATCH] Distributed test updated

---
 molecule/distributed-wazuh/converge.yml       | 84 ++++++++++++++++++-
 .../group_vars/dashboard.yml                  |  1 +
 .../distributed-wazuh/group_vars/indexer.yml  |  1 +
 .../distributed-wazuh/group_vars/managers.yml |  2 +
 4 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/molecule/distributed-wazuh/converge.yml b/molecule/distributed-wazuh/converge.yml
index 53f95153..5033b56a 100644
--- a/molecule/distributed-wazuh/converge.yml
+++ b/molecule/distributed-wazuh/converge.yml
@@ -46,7 +46,33 @@
       vars:
         generate_certs: true
         perform_installation: false
-        instances: '{{ wazuh_endpoint_list }}'
+        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
   pre_tasks:
     - name: overview of cert configuration
       debug:
@@ -60,6 +86,34 @@
     # 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']
@@ -68,6 +122,34 @@
     # 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:
diff --git a/molecule/distributed-wazuh/group_vars/dashboard.yml b/molecule/distributed-wazuh/group_vars/dashboard.yml
index 73550266..0cc8e6f5 100644
--- a/molecule/distributed-wazuh/group_vars/dashboard.yml
+++ b/molecule/distributed-wazuh/group_vars/dashboard.yml
@@ -7,6 +7,7 @@ indexer_network_host: "{{ indexer_addresses[0] }}"
 indexer_node_master: false
 indexer_node_ingest: false
 indexer_node_data: false
+role: 'dashboard'
 
 wazuh_api_credentials:
   - id: default
diff --git a/molecule/distributed-wazuh/group_vars/indexer.yml b/molecule/distributed-wazuh/group_vars/indexer.yml
index 747fdd6c..f8804629 100644
--- a/molecule/distributed-wazuh/group_vars/indexer.yml
+++ b/molecule/distributed-wazuh/group_vars/indexer.yml
@@ -3,6 +3,7 @@
 single_node: false
 indexer_node_master: true
 minimum_master_nodes: 1
+role: 'indexer'
 
 indexer_network_host: '{{ private_ip }}'
 
diff --git a/molecule/distributed-wazuh/group_vars/managers.yml b/molecule/distributed-wazuh/group_vars/managers.yml
index 866b1ebe..354136c7 100644
--- a/molecule/distributed-wazuh/group_vars/managers.yml
+++ b/molecule/distributed-wazuh/group_vars/managers.yml
@@ -2,6 +2,8 @@
 
 wazuh_manager_fqdn: '{{ ansible_hostname }}'
 filebeat_output_indexer_hosts: '{{ indexer_addresses }}'
+node_type: "{{ 'master' if ansible_hostname == 'wazuh-mgr01' else 'worker' }}"
+role: 'wazuh'
 
 wazuh_manager_config:
   connection: