afmarulanda/wazuh-ansible-4.8.1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conditionals error related with AL2 custom packages installation

Browse Source
This commit is contained in:
Jose M 2020-03-03 13:14:13 +01:00
parent 1fb14f66d4
commit 4982b2868d
No known key found for this signature in database
GPG Key ID: 790179D6924E10FF
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/wazuh/ansible-wazuh-agent/tasks/installation_from_custom_packages.yml
View File

@ -16,7 +16,6 @@
- wazuh_custom_packages_installation_agent_enabled - wazuh_custom_packages_installation_agent_enabled
- not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") - not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8")
- not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8") - not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
- not (ansible_distribution|lower == "amazon" and ansible_distribution_major_version >= "2")
- name: Install Wazuh Agent from .rpm packages | dnf - name: Install Wazuh Agent from .rpm packages | dnf
dnf: dnf:
@ -26,5 +25,4 @@
- ansible_os_family|lower == "redhat" - ansible_os_family|lower == "redhat"
- wazuh_custom_packages_installation_agent_enabled - wazuh_custom_packages_installation_agent_enabled
- (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or - (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or
(ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8") or (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
(ansible_distribution|lower == "amazon" and ansible_distribution_major_version >= "2")

11
roles/wazuh/ansible-wazuh-manager/tasks/installation_from_custom_packages.yml
View File

@ -27,7 +27,6 @@
- wazuh_custom_packages_installation_manager_enabled - wazuh_custom_packages_installation_manager_enabled
- not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") - not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8")
- not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8") - not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
- not (ansible_distribution|lower == "amazon" and ansible_distribution_major_version >= "2")
- name: Install Wazuh Manager from .rpm packages | dnf - name: Install Wazuh Manager from .rpm packages | dnf
dnf: dnf:
@ -36,9 +35,7 @@
when: when:
- wazuh_custom_packages_installation_manager_enabled - wazuh_custom_packages_installation_manager_enabled
- (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or - (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or
(ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8") or (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
(ansible_distribution|lower == "amazon" and ansible_distribution_major_version >= "2")
- name: Install Wazuh API from .rpm packages | yum - name: Install Wazuh API from .rpm packages | yum
yum: yum:
@ -48,7 +45,6 @@
- wazuh_custom_packages_installation_api_enabled - wazuh_custom_packages_installation_api_enabled
- not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") - not (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8")
- not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8") - not (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
- not (ansible_distribution|lower == "amazon" and ansible_distribution_major_version >= "2")
- wazuh_manager_config.cluster.node_type == "master" - wazuh_manager_config.cluster.node_type == "master"
- name: Install Wazuh API from .rpm packages | dnf - name: Install Wazuh API from .rpm packages | dnf
@ -58,9 +54,8 @@
when: when:
- wazuh_custom_packages_installation_api_enabled - wazuh_custom_packages_installation_api_enabled
- (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or - (ansible_distribution|lower == "centos" and ansible_distribution_major_version >= "8") or
(ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8") or (ansible_distribution|lower == "redhat" and ansible_distribution_major_version >= "8")
(ansible_distribution|lower == "amazon" and ansible_distribution_major_version >= "2")
- wazuh_manager_config.cluster.node_type == "master" - wazuh_manager_config.cluster.node_type == "master"
when: when:
- ansible_os_family|lower == "redhat" - ansible_os_family|lower == "redhat"