fix: Fix qactl ansible connection issue #1723

wazuh · Aug 23, 2021 · 0a49d21 · 0a49d21
1 parent 361e70d
commit 0a49d21
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/deps/wazuh_testing/wazuh_testing/qa_ctl/provisioning/QAProvisioning.py b/deps/wazuh_testing/wazuh_testing/qa_ctl/provisioning/QAProvisioning.py
@@ -5,6 +5,8 @@
 from wazuh_testing.qa_ctl.provisioning.wazuh_deployment.WazuhSources import WazuhSources
 from wazuh_testing.qa_ctl.provisioning.wazuh_deployment.AgentDeployment import AgentDeployment
 from wazuh_testing.qa_ctl.provisioning.wazuh_deployment.ManagerDeployment import ManagerDeployment
+from wazuh_testing.qa_ctl.provisioning.ansible.AnsibleRunner import AnsibleRunner
+from wazuh_testing.qa_ctl.provisioning.ansible.AnsibleTask import AnsibleTask
 from wazuh_testing.qa_ctl.provisioning.qa_framework.QAFramework import QAFramework
 
 
@@ -38,7 +40,7 @@ def __init__(self, provision_info):
     def __read_ansible_instance(self, host_info):
         """Read every host info and generate the AnsibleInstance object.
 
-        Attributes:
+        Args:
             host_info (dict): Dict with the host info needed coming from config file.
 
         Returns:
@@ -55,6 +57,19 @@ def __read_ansible_instance(self, host_info):
                                    ansible_python_interpreter=host_info['ansible_python_interpreter'])
         return instance
 
+    def check_hosts_connection(self, hosts='all'):
+        """Check that all hosts are reachable via SSH connection
+
+        Args:
+            hosts (str): Hosts to check.
+        """
+        wait_for_connection = AnsibleTask({'name': 'Waiting for SSH hosts connection are reachable',
+                                           'wait_for_connection': {'delay': 5, 'timeout': 60}})
+
+        playbook_parameters = {'hosts': hosts, 'tasks_list': [wait_for_connection]}
+
+        AnsibleRunner.run_ephemeral_tasks(self.inventory_file_path, playbook_parameters)
+
     def process_inventory_data(self):
         """Process config file info to generate the ansible inventory file."""
         for root_key, root_value in self.provision_info.items():

diff --git a/deps/wazuh_testing/wazuh_testing/scripts/qa_ctl.py b/deps/wazuh_testing/wazuh_testing/scripts/qa_ctl.py
@@ -5,7 +5,6 @@
 import os
 import yaml
 
-from time import sleep
 from wazuh_testing.qa_ctl.deployment.QAInfraestructure import QAInfraestructure
 from wazuh_testing.qa_ctl.provisioning.QAProvisioning import QAProvisioning
 from wazuh_testing.qa_ctl.run_tests.QARunTests import RunQATests
@@ -41,11 +40,10 @@ def main():
                 instance_handler.run()
 
             if PROVISION_KEY in yaml_config:
-                if DEPLOY_KEY in yaml_config:
-                    sleep(5)  # If machines are deployed, wait 5 seconds before connecting
                 provision_dict = yaml_config[PROVISION_KEY]
                 qa_provisioning = QAProvisioning(provision_dict)
                 qa_provisioning.process_inventory_data()
+                qa_provisioning.check_hosts_connection()
                 qa_provisioning.process_deployment_data()
 
             if TEST_KEY in yaml_config: