Update tasks related to manager installation. Remove -1, update state

This commit is contained in:
Jose M 2019-11-06 14:16:36 +01:00
parent 1c2d6d41ec
commit d64b107fbb

View File

@ -14,20 +14,22 @@
when: ansible_os_family == "Debian" when: ansible_os_family == "Debian"
- name: CentOS/RedHat/Amazon | Install wazuh-manager, wazuh-api - name: CentOS/RedHat/Amazon | Install wazuh-manager, wazuh-api
package: pkg={{ item }}-{{ wazuh_manager_api_version }}-1 state={{ wazuh_manager_package_state }} package:
name: "{{ item }}-{{ wazuh_manager_version }}"
state: "{{ wazuh_manager_package_state }}"
with_items: with_items:
- wazuh-manager - wazuh-manager
- wazuh-api - wazuh-api
register: wazuh_manager_main_packages_installed register: wazuh_manager_main_packages_installed
until: wazuh_manager_main_packages_installed is succeeded until: wazuh_manager_main_packages_installed is succeeded
when: when:
- ansible_distribution in ['CentOS','RedHat', 'Amazon'] - ansible_os_family|lower == "redhat"
tags: tags:
- init - init
- name: Debian/Ubuntu | Install wazuh-manager, wazuh-api - name: Debian/Ubuntu | Install wazuh-manager, wazuh-api
apt: apt:
name: "{{ item }}={{ wazuh_manager_api_version }}-1" name: "{{ item }}={{ wazuh_manager_version }}"
state: present state: present
cache_valid_time: 3600 cache_valid_time: 3600
with_items: with_items:
@ -36,13 +38,15 @@
register: wazuh_manager_main_packages_installed register: wazuh_manager_main_packages_installed
until: wazuh_manager_main_packages_installed is succeeded until: wazuh_manager_main_packages_installed is succeeded
when: when:
- not (ansible_distribution in ['CentOS','RedHat', 'Amazon']) - not (ansible_os_family|lower == "redhat")
tags: init tags: init
- name: Install expect - name: Install expect
package: pkg=expect state={{ wazuh_manager_package_state }} package:
name: expect
state: "{{ wazuh_manager_package_state }}"
when: when:
- not (ansible_distribution in ['CentOS','RedHat', 'Amazon'] and ansible_distribution_major_version|int < 6) - not (ansible_os_family|lower == "redhat" and ansible_distribution_major_version|int < 6)
tags: init tags: init
- name: CentOS/RedHat 6 | Enabling python2.7 and sqlite3 - name: CentOS/RedHat 6 | Enabling python2.7 and sqlite3
@ -54,15 +58,17 @@
- ansible_distribution in ['CentOS', 'RedHat', 'Amazon'] and ansible_distribution_major_version|int == 6 - ansible_distribution in ['CentOS', 'RedHat', 'Amazon'] and ansible_distribution_major_version|int == 6
- wazuh_manager_config.cluster.disable != 'yes' - wazuh_manager_config.cluster.disable != 'yes'
- name: Install wazuh-manager and expect (EL5) - name: Install expect (EL5)
package: pkg={{ item }} state={{ wazuh_manager_package_state }} package:
name: "{{ item }}"
state: "{{ wazuh_manager_package_state }}"
with_items: with_items:
- wazuh-manager-{{ wazuh_manager_api_version }}
- expect - expect
register: wazuh_manager_main_packages_installed register: wazuh_manager_main_packages_installed
until: wazuh_manager_main_packages_installed is succeeded until: wazuh_manager_main_packages_installed is succeeded
when: when:
- ansible_distribution in ['CentOS','RedHat', 'Amazon'] and ansible_distribution_major_version|int < 6 - ansible_os_family|lower == "RedHat"
- ansible_distribution_major_version|int < 6
tags: tags:
- init - init