From 41f7be184ef4718e4c157703b73f3da8fa8c494b Mon Sep 17 00:00:00 2001
From: Werner Dijkerman <werner@dj-wasabi.nl>
Date: Tue, 16 Apr 2019 19:16:54 +0200
Subject: [PATCH] Added retries for tasks that work with "3rd" party services

---
 .../wazuh/ansible-wazuh-manager/tasks/Debian.yml  |  6 ++++++
 .../wazuh/ansible-wazuh-manager/tasks/RedHat.yml  | 15 +++++++++++++++
 roles/wazuh/ansible-wazuh-manager/tasks/main.yml  |  4 ++++
 3 files changed, 25 insertions(+)

diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
index e9be63db..beb764b2 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/Debian.yml
@@ -6,6 +6,8 @@
       - ca-certificates
       - gnupg
     state: present
+    register: wazuh_manager_https_packages_installed
+    until: wazuh_manager_https_packages_installed is succeeded
     cache_valid_time: 3600
 
 - name: Debian/Ubuntu | Installing Wazuh repository key (Ubuntu 14)
@@ -84,6 +86,8 @@
       name: oracle-java8-installer
       state: present
       cache_valid_time: 3600
+    register: wazuh_manager_oracle_java_8_installed
+    until: wazuh_manager_oracle_java_8_installed is succeeded
   tags:
     - init
 
@@ -92,6 +96,8 @@
     name: "{{ item }}"
     state: present
     cache_valid_time: 3600
+  register: wazuh_manager_openscap_installed
+  until: wazuh_manager_openscap_installed is succeeded
   when: wazuh_manager_config.openscap.disable == 'no'
   with_items:
     - libopenscap8
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
index 0bf5aca2..3f498b67 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/RedHat.yml
@@ -33,6 +33,8 @@
   yum:
     name: nodejs
     state: present
+  register: wazuh_manager_amz_node_packages_installed
+  until: wazuh_manager_amz_node_packages_installed is succeeded
   when:
     - ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA"
 
@@ -62,12 +64,16 @@
   with_items:
     - openscap-scanner
     - openssl
+  register: wazuh_manager_openscp_packages_installed
+  until: wazuh_manager_openscp_packages_installed is succeeded
   tags:
     - init
   when: not (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
 
 - name: CentOS 6 | Install Software Collections (SCL) Repository
   package: name=centos-release-scl state=present
+  register: wazuh_manager_scl_packages_installed
+  until: wazuh_manager_scl_packages_installed is succeeded
   when:
     - ansible_distribution == 'CentOS' and ansible_distribution_major_version == '6'
     - wazuh_manager_config.cluster.disable != 'yes'
@@ -83,12 +89,16 @@
 
 - name: CentOS/RedHat 6 | Install Python 2.7
   package: name=python27 state=present
+  register: wazuh_manager_python_package_installed
+  until: wazuh_manager_python_package_installed is succeeded
   when:
     - ( ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat' ) and ansible_distribution_major_version == '6'
     - wazuh_manager_config.cluster.disable != 'yes'
 
 - name: CentOS/RedHat 6 | Install python-cryptography module
   pip: name=cryptography state=present
+  register: wazuh_manager_cryptography_package_installed
+  until: wazuh_manager_cryptography_package_installed is succeeded
   environment:
     PATH: "/opt/rh/python27/root/usr/bin:{{ ansible_env.PATH }}"
     LD_LIBRARY_PATH: "/opt/rh/python27/root/usr/lib64:/opt/rh/python27/root/usr/lib"
@@ -98,6 +108,8 @@
 
 - name: RedHat/CentOS/Fedora | Install python-cryptography module
   package: name=python-cryptography state=present
+  register: wazuh_manager_cryptography_package_installed
+  until: wazuh_manager_cryptography_package_installed is succeeded
   when:
     - not (( ansible_distribution == 'CentOS' or ansible_distribution == 'RedHat') and ansible_distribution_major_version == '6' )
     - wazuh_manager_config.cluster.disable != 'yes'
@@ -108,6 +120,7 @@
     dest: /tmp/jre-8-linux-x64.rpm
     headers: 'Cookie:oraclelicense=accept-securebackup-cookie'
   register: oracle_java_task_rpm_download
+  until: oracle_java_task_rpm_download is succeeded
   when:
     - wazuh_manager_config.cis_cat.disable == 'no'
     - wazuh_manager_config.cis_cat.install_java == 'yes'
@@ -116,6 +129,8 @@
 
 - name: RedHat/CentOS/Fedora | Install Oracle Java RPM
   package: name=/tmp/jre-8-linux-x64.rpm state=present
+  register: wazuh_manager_oracle_java_installed
+  until: wazuh_manager_oracle_java_installed is succeeded
   when:
     - wazuh_manager_config.cis_cat.disable == 'no'
     - wazuh_manager_config.cis_cat.install_java == 'yes'
diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
index 02c2a440..9e538e09 100644
--- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
+++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml
@@ -11,6 +11,8 @@
     - wazuh-manager
     - wazuh-api
     - expect
+  register: wazuh_manager_main_packages_installed
+  until: wazuh_manager_main_packages_installed is succeeded
   when:
     - not (ansible_distribution in ['CentOS','RedHat'] and ansible_distribution_major_version|int < 6)
   tags:
@@ -30,6 +32,8 @@
   with_items:
     - wazuh-manager
     - expect
+  register: wazuh_manager_main_packages_installed
+  until: wazuh_manager_main_packages_installed is succeeded
   when:
     - ansible_distribution in ['CentOS','RedHat'] and ansible_distribution_major_version|int < 6
   tags: