Skip to content

Commit 1f44558

Browse files
committed
try to fix the verify tasks
1 parent acce50b commit 1f44558

2 files changed

Lines changed: 65 additions & 20 deletions

File tree

roles/icinga_agent/molecule/default/converge.yml

Lines changed: 57 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,64 +98,109 @@
9898
state: file
9999
register: result_icinga2_conf
100100

101-
- name: validate icinga2.conf results
101+
- name: validate icinga2.conf results for RedHat based Distributions
102102
assert:
103103
that:
104104
- "result_icinga2_conf.state == 'file'"
105105
- "result_icinga2_conf.mode == '0640'"
106106
- "result_icinga2_conf.owner == 'icinga'"
107107
- "result_icinga2_conf.group == 'icinga'"
108+
when: ansible_os_family == 'RedHat'
109+
110+
- name: validate icinga2.conf results for Debian based Distributions
111+
assert:
112+
that:
113+
- "result_icinga2_conf.state == 'file'"
114+
- "result_icinga2_conf.mode == '0640'"
115+
- "result_icinga2_conf.owner == 'nagios'"
116+
- "result_icinga2_conf.group == 'nagios'"
117+
when: ansible_os_family == 'Debian'
108118

109119
- name: verify that constants.conf exists
110120
file:
111121
path: /etc/icinga2/constants.conf
112122
state: file
113123
register: result_constants_conf
114124

115-
- name: validate constants.conf results
125+
- name: validate constants.conf results for RedHat based Distributions
116126
assert:
117127
that:
118128
- "result_constants_conf.state == 'file'"
119129
- "result_constants_conf.mode == '0640'"
120130
- "result_constants_conf.owner == 'icinga'"
121131
- "result_constants_conf.group == 'icinga'"
132+
when: ansible_os_family == 'RedHat'
133+
134+
- name: validate constants.conf results for Debian based Distributions
135+
assert:
136+
that:
137+
- "result_constants_conf.state == 'file'"
138+
- "result_constants_conf.mode == '0640'"
139+
- "result_constants_conf.owner == 'nagios'"
140+
- "result_constants_conf.group == 'nagios'"
141+
when: ansible_os_family == 'Debian'
122142

123143
- name: verify that zones.conf exists
124144
file:
125145
path: /etc/icinga2/zones.conf
126146
state: file
127147
register: result_zones_conf
128148

129-
- name: validate zones.conf results
149+
- name: validate zones.conf results for RedHat based Distributions
130150
assert:
131151
that:
132152
- "result_zones_conf.state == 'file'"
133153
- "result_zones_conf.mode == '0640'"
134154
- "result_zones_conf.owner == 'icinga'"
135155
- "result_zones_conf.group == 'icinga'"
156+
when: ansible_os_family == 'RedHat'
157+
158+
- name: validate zones.conf results for Debian based Distributions
159+
assert:
160+
that:
161+
- "result_zones_conf.state == 'file'"
162+
- "result_zones_conf.mode == '0640'"
163+
- "result_zones_conf.owner == 'nagios'"
164+
- "result_zones_conf.group == 'nagios'"
165+
when: ansible_os_family == 'Debian'
136166

137167
- name: verify that api.conf exists
138168
file:
139169
path: /etc/icinga2/features-available/api.conf
140170
state: file
141171
register: result_api_conf
142172

143-
- name: validate api.conf results
173+
- name: validate api.conf results for RedHat based Distributions
144174
assert:
145175
that:
146176
- "result_api_conf.state == 'file'"
147177
- "result_api_conf.mode == '0640'"
148178
- "result_api_conf.owner == 'icinga'"
149179
- "result_api_conf.group == 'icinga'"
150-
151-
- name: verify that icinga2 package is installed
152-
yum:
153-
name: icinga2
154-
state: present
155180
when: ansible_os_family == 'RedHat'
156181

157-
- name: verify that icinga2 package is installed for Debian based systems
158-
apt:
182+
- name: validate api.conf results for Debian based Distributions
183+
assert:
184+
that:
185+
- "result_api_conf.state == 'file'"
186+
- "result_api_conf.mode == '0640'"
187+
- "result_api_conf.owner == 'nagios'"
188+
- "result_api_conf.group == 'nagios'"
189+
when: ansible_os_family == 'Debian'
190+
191+
# - name: verify that icinga2 package is installed
192+
# yum:
193+
# name: icinga2
194+
# state: present
195+
# when: ansible_os_family == 'RedHat'
196+
197+
# - name: verify that icinga2 package is installed for Debian based systems
198+
# apt:
199+
# name: icinga2
200+
# state: present
201+
# when: ansible_os_family == 'Debian'
202+
203+
- name: verify that icinga2 package is installed
204+
ansible.builtin.package:
159205
name: icinga2
160206
state: present
161-
when: ansible_os_family == 'Debian'

roles/icinga_agent/tasks/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
- name: create /etc/icinga2/repository.d
1010
ansible.builtin.file:
1111
dest: "/etc/icinga2/repository.d"
12-
owner: "{{icinga2_user[ansible_os_family]}}"
13-
group: "{{icinga2_group[ansible_os_family]}}"
12+
owner: "{{ icinga2_user[ansible_os_family] }}"
13+
group: "{{ icinga2_group[ansible_os_family] }}"
1414
state: directory
1515
when:
1616
- icinga_agent_repositoryd_directory is defined
@@ -19,8 +19,8 @@
1919
ansible.builtin.template:
2020
src: "{{ item }}"
2121
dest: "/etc/icinga2/{{ item | basename | regex_replace('.j2', '') }}"
22-
owner: "{{icinga2_user[ansible_os_family]}}"
23-
group: "{{icinga2_group[ansible_os_family]}}"
22+
owner: "{{ icinga2_user[ansible_os_family] }}"
23+
group: "{{ icinga2_group[ansible_os_family] }}"
2424
mode: 0640
2525
with_fileglob:
2626
- "../templates/configuration/*"
@@ -31,8 +31,8 @@
3131
ansible.builtin.template:
3232
src: "{{ item }}"
3333
dest: "/etc/icinga2/features-available/{{ item | basename | regex_replace('.j2', '') }}"
34-
owner: "{{icinga2_user[ansible_os_family]}}"
35-
group: "{{icinga2_group[ansible_os_family]}}"
34+
owner: "{{ icinga2_user[ansible_os_family] }}"
35+
group: "{{ icinga2_group[ansible_os_family] }}"
3636
mode: 0640
3737
with_fileglob:
3838
- "../templates/features/*"
@@ -43,8 +43,8 @@
4343
ansible.builtin.template:
4444
src: "{{ item }}"
4545
dest: "/etc/icinga2/features-available/{{ item | basename | regex_replace('.j2', '') }}"
46-
owner: "{{icinga2_user[ansible_os_family]}}"
47-
group: "{{icinga2_group[ansible_os_family]}}"
46+
owner: "{{ icinga2_user[ansible_os_family] }}"
47+
group: "{{ icinga2_group[ansible_os_family] }}"
4848
mode: 0640
4949
with_fileglob:
5050
- "{{ icinga_agent_custom_features_template_path }}"

0 commit comments

Comments
 (0)