Added where possible the wazuh-manager role idempotent. Have to disable this because of issue #107
This commit is contained in:
parent
8291e4ab9f
commit
dc8438401f
@ -37,6 +37,20 @@ provisioner:
|
|||||||
enabled: true # fix in seperate PR
|
enabled: true # fix in seperate PR
|
||||||
scenario:
|
scenario:
|
||||||
name: default
|
name: default
|
||||||
|
test_sequence:
|
||||||
|
- lint
|
||||||
|
- dependency
|
||||||
|
- cleanup
|
||||||
|
- destroy
|
||||||
|
- syntax
|
||||||
|
- create
|
||||||
|
- prepare
|
||||||
|
- converge
|
||||||
|
# - idempotence
|
||||||
|
- side_effect
|
||||||
|
- verify
|
||||||
|
- cleanup
|
||||||
|
- destroy
|
||||||
verifier:
|
verifier:
|
||||||
name: testinfra
|
name: testinfra
|
||||||
lint:
|
lint:
|
||||||
|
|||||||
@ -31,6 +31,7 @@
|
|||||||
repo: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
|
repo: 'deb https://packages.wazuh.com/3.x/apt/ stable main'
|
||||||
state: present
|
state: present
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
changed_when: False
|
||||||
|
|
||||||
- name: Debian/Ubuntu | Installing NodeJS repository key (Ubuntu 14)
|
- name: Debian/Ubuntu | Installing NodeJS repository key (Ubuntu 14)
|
||||||
become: yes
|
become: yes
|
||||||
@ -55,6 +56,7 @@
|
|||||||
repo: "deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main"
|
repo: "deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main"
|
||||||
state: present
|
state: present
|
||||||
update_cache: yes
|
update_cache: yes
|
||||||
|
changed_when: False
|
||||||
|
|
||||||
- name: Debian/Ubuntu | Set Distribution CIS filename for Debian/Ubuntu
|
- name: Debian/Ubuntu | Set Distribution CIS filename for Debian/Ubuntu
|
||||||
set_fact:
|
set_fact:
|
||||||
@ -101,7 +103,7 @@
|
|||||||
shell: "dpkg-query --showformat='${Version}' --show libopenscap8"
|
shell: "dpkg-query --showformat='${Version}' --show libopenscap8"
|
||||||
when: wazuh_manager_config.openscap.disable == 'no'
|
when: wazuh_manager_config.openscap.disable == 'no'
|
||||||
register: openscap_version
|
register: openscap_version
|
||||||
changed_when: true
|
changed_when: False
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
@ -109,6 +111,6 @@
|
|||||||
shell: "dpkg --compare-versions '{{ openscap_version.stdout }}' '>=' '1.2'; echo $?"
|
shell: "dpkg --compare-versions '{{ openscap_version.stdout }}' '>=' '1.2'; echo $?"
|
||||||
when: wazuh_manager_config.openscap.disable == 'no'
|
when: wazuh_manager_config.openscap.disable == 'no'
|
||||||
register: openscap_version_valid
|
register: openscap_version_valid
|
||||||
changed_when: true
|
changed_when: False
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|||||||
@ -3,8 +3,10 @@
|
|||||||
apt_repository:
|
apt_repository:
|
||||||
repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main
|
repo: deb https://packages.wazuh.com/apt {{ ansible_distribution_release }} main
|
||||||
state: absent
|
state: absent
|
||||||
|
changed_when: False
|
||||||
|
|
||||||
- name: Debian/Ubuntu | Remove Nodejs repository.
|
- name: Debian/Ubuntu | Remove Nodejs repository.
|
||||||
apt_repository:
|
apt_repository:
|
||||||
repo: deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main
|
repo: deb https://deb.nodesource.com/node_6.x {{ ansible_distribution_release }} main
|
||||||
state: absent
|
state: absent
|
||||||
|
changed_when: False
|
||||||
|
|||||||
@ -3,8 +3,10 @@
|
|||||||
yum_repository:
|
yum_repository:
|
||||||
name: NodeJS
|
name: NodeJS
|
||||||
state: absent
|
state: absent
|
||||||
|
changed_when: False
|
||||||
|
|
||||||
- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata)
|
- name: RedHat/CentOS/Fedora | Remove Wazuh repository (and clean up left-over metadata)
|
||||||
yum_repository:
|
yum_repository:
|
||||||
name: wazuh_repo
|
name: wazuh_repo
|
||||||
state: absent
|
state: absent
|
||||||
|
changed_when: False
|
||||||
|
|||||||
@ -6,6 +6,7 @@
|
|||||||
baseurl: https://rpm.nodesource.com/pub_6.x/el/{{ ansible_distribution_major_version }}/x86_64
|
baseurl: https://rpm.nodesource.com/pub_6.x/el/{{ ansible_distribution_major_version }}/x86_64
|
||||||
gpgkey: https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
|
gpgkey: https://rpm.nodesource.com/pub/el/NODESOURCE-GPG-SIGNING-KEY-EL
|
||||||
gpgcheck: yes
|
gpgcheck: yes
|
||||||
|
changed_when: False
|
||||||
when:
|
when:
|
||||||
- ansible_distribution_major_version|int > 5
|
- ansible_distribution_major_version|int > 5
|
||||||
|
|
||||||
@ -42,6 +43,7 @@
|
|||||||
baseurl: https://packages.wazuh.com/3.x/yum/
|
baseurl: https://packages.wazuh.com/3.x/yum/
|
||||||
gpgkey: https://packages.wazuh.com/key/GPG-KEY-WAZUH
|
gpgkey: https://packages.wazuh.com/key/GPG-KEY-WAZUH
|
||||||
gpgcheck: yes
|
gpgcheck: yes
|
||||||
|
changed_when: False
|
||||||
when:
|
when:
|
||||||
- (ansible_distribution_major_version|int > 5) or (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
|
- (ansible_distribution_major_version|int > 5) or (ansible_distribution == "Amazon" and ansible_distribution_major_version == "NA")
|
||||||
|
|
||||||
|
|||||||
@ -329,12 +329,16 @@
|
|||||||
group: ossec
|
group: ossec
|
||||||
mode: 0640
|
mode: 0640
|
||||||
no_log: true
|
no_log: true
|
||||||
|
register: wazuh_manager_cdb_lists
|
||||||
|
until: wazuh_manager_cdb_lists is succeeded
|
||||||
notify:
|
notify:
|
||||||
- rebuild cdb_lists
|
- rebuild cdb_lists
|
||||||
- restart wazuh-manager
|
- restart wazuh-manager
|
||||||
with_items:
|
with_items:
|
||||||
- "{{ cdb_lists }}"
|
- "{{ cdb_lists }}"
|
||||||
when: cdb_lists is defined
|
when:
|
||||||
|
- cdb_lists is defined
|
||||||
|
- cdb_lists is iterable
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user