Browse Source

icinga: fix yamllint errors

keep-around/29364a9feb7c22d700f0e5ac8a4e2a2e5789e0f4
singuliere 3 years ago
parent
commit
55f2e48a21
No known key found for this signature in database GPG Key ID: 900857755EF189C2
  1. 2
      molecule/icinga/molecule.yml
  2. 2
      molecule/icinga/roles/icinga2/defaults/main.yml
  3. 10
      molecule/icinga/roles/icinga2/tasks/main.yml
  4. 6
      molecule/icinga/roles/icinga2_client/tasks/main.yml
  5. 2
      molecule/icinga/roles/monitor_tor_http_vhost/tasks/main.yml
  6. 1
      molecule/icinga/test-icinga-playbook.yml

2
molecule/icinga/molecule.yml

@ -28,7 +28,7 @@ provisioner:
inventory:
links:
group_vars: ../../inventories/common/group_vars
host_vars: ../../inventories/common/host_vars
host_vars: ../../inventories/common/host_vars
scenario:
name: icinga
test_sequence:

2
molecule/icinga/roles/icinga2/defaults/main.yml

@ -1,3 +1,3 @@
---
icingaweb2_user: "icingaadmin"
icingaweb2_user: "icingaadmin"
icingaweb2_user_pass: "zoR9thie6Phud4mooYoo"

10
molecule/icinga/roles/icinga2/tasks/main.yml

@ -11,13 +11,13 @@
- name: apt-get install monitoring plugins
apt:
name: [monitoring-plugins, nagios-plugins-contrib]
name: [ monitoring-plugins, nagios-plugins-contrib ]
state: present
install_recommends: no
- name: apt-get install monitoring plugins deps
apt:
name: [dnsutils, xz-utils]
name: [ dnsutils, xz-utils ]
state: present
- name: wait for icinga starting up and conf creation, before tweaking it
@ -86,12 +86,12 @@
- name: fix mail-service-notification.sh
copy:
src: files/scripts/mail-service-notification.sh
src: files/scripts/mail-service-notification.sh
dest: /etc/icinga2/scripts/mail-service-notification.sh
- name: deploy our global configuration
copy:
src: files/{{ item }}.conf
src: files/{{ item }}.conf
dest: /etc/icinga2/zones.d/global-templates/{{ item }}.conf
loop:
- commands
@ -111,7 +111,7 @@
- name: deploy our templated configuration
template:
src: templates/{{ item }}.conf
src: templates/{{ item }}.conf
dest: /etc/icinga2/zones.d/global-templates/{{ item }}.conf
loop:
- users

6
molecule/icinga/roles/icinga2_client/tasks/main.yml

@ -7,7 +7,7 @@
- name: apt-get install monitoring plugins
apt:
name: [monitoring-plugins, nagios-plugins-contrib]
name: [ monitoring-plugins, nagios-plugins-contrib ]
state: present
install_recommends: no
@ -47,7 +47,7 @@
--key /etc/icinga2/pki/{{ inventory_hostname }}.key \
--cert /etc/icinga2/pki/{{ inventory_hostname }}.crt
args:
creates: /etc/icinga2/pki/{{ inventory_hostname }}.crt
creates: /etc/icinga2/pki/{{ inventory_hostname }}.crt
- name: wait for master availability
wait_for:
@ -63,7 +63,7 @@
--trustedcert /etc/icinga2/pki/trusted-master.crt \
--host {{ hostvars['icinga-host']['ansible_host'] }}
args:
creates: /etc/icinga2/pki/trusted-master.crt
creates: /etc/icinga2/pki/trusted-master.crt
register: output
until: output is success
retries: 10

2
molecule/icinga/roles/monitor_tor_http_vhost/tasks/main.yml

@ -1,6 +1,6 @@
- name: install tor for check_tor_http
apt:
name: [tor, torsocks]
name: [ tor, torsocks ]
state: present
delegate_to: icinga-host

1
molecule/icinga/test-icinga-playbook.yml

@ -11,4 +11,3 @@
firewall_clients: [ 0.0.0.0/0 ]
firewall_protocols: [ tcp ]
firewall_ports: [ 5665 ]

Loading…
Cancel
Save