From 0f6ea26123aaf97d60c2769ad69441fc8bfd7540 Mon Sep 17 00:00:00 2001 From: neonmei Date: Mon, 9 Nov 2020 14:04:55 -0300 Subject: [PATCH] roles/wazuh_manager: merge uninstall tasks in a single file --- .../ansible-wazuh-manager/tasks/RMDebian.yml | 6 ------ .../ansible-wazuh-manager/tasks/RMRedHat.yml | 7 ------- roles/wazuh/ansible-wazuh-manager/tasks/main.yml | 12 +++--------- .../ansible-wazuh-manager/tasks/uninstall.yml | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 22 deletions(-) delete mode 100644 roles/wazuh/ansible-wazuh-manager/tasks/RMDebian.yml delete mode 100644 roles/wazuh/ansible-wazuh-manager/tasks/RMRedHat.yml create mode 100644 roles/wazuh/ansible-wazuh-manager/tasks/uninstall.yml diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/RMDebian.yml b/roles/wazuh/ansible-wazuh-manager/tasks/RMDebian.yml deleted file mode 100644 index 2b22dfbc..00000000 --- a/roles/wazuh/ansible-wazuh-manager/tasks/RMDebian.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: Debian/Ubuntu | Remove Wazuh repository. - apt_repository: - repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main - state: absent - changed_when: false diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/RMRedHat.yml b/roles/wazuh/ansible-wazuh-manager/tasks/RMRedHat.yml deleted file mode 100644 index c725859e..00000000 --- a/roles/wazuh/ansible-wazuh-manager/tasks/RMRedHat.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- - -- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata) - yum_repository: - name: wazuh_repo - state: absent - changed_when: false diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml index bdd5ce83..72c995b8 100644 --- a/roles/wazuh/ansible-wazuh-manager/tasks/main.yml +++ b/roles/wazuh/ansible-wazuh-manager/tasks/main.yml @@ -321,12 +321,6 @@ - ( agent_groups is defined) and ( agent_groups|length > 0) tags: molecule-idempotence-notest -- include_tasks: "RMRedHat.yml" - when: - - ansible_os_family == "RedHat" or ansible_os_family == "Amazon" - - not wazuh_manager_sources_installation.enabled - -- include_tasks: "RMDebian.yml" - when: - - ansible_os_family == "Debian" - - not wazuh_manager_sources_installation.enabled +- name: Run uninstall tasks + include_tasks: uninstall.yml + when: not wazuh_manager_sources_installation.enabled diff --git a/roles/wazuh/ansible-wazuh-manager/tasks/uninstall.yml b/roles/wazuh/ansible-wazuh-manager/tasks/uninstall.yml new file mode 100644 index 00000000..b74f61a4 --- /dev/null +++ b/roles/wazuh/ansible-wazuh-manager/tasks/uninstall.yml @@ -0,0 +1,15 @@ +--- + +- name: Debian/Ubuntu | Remove Wazuh repository. + apt_repository: + repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main + state: absent + changed_when: false + when: not wazuh_manager_sources_installation.enabled + +- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata) + yum_repository: + name: wazuh_repo + state: absent + changed_when: false + when: ansible_os_family == "RedHat" or ansible_os_family == "Amazon"