check-mk-agent: Add "systemd" tag to task checking for service file

[AnsibleRoles.git] / roles / check-mk-agent / tasks / main.yml

diff --git a/roles/check-mk-agent/tasks/main.yml b/roles/check-mk-agent/tasks/main.yml
index abc3006557e929a41a5f3981535e1428d8c97b7c..0e59f1872966e856cd080eae8c561d8bd08d2dac 100644 (file)
--- a/roles/check-mk-agent/tasks/main.yml
+++ b/roles/check-mk-agent/tasks/main.yml
@@ -6,12 +6,12 @@
     - check_mk
     - monitoring
     - packages
-  apt: >
-    state=installed
-    name={{ item }}
-  with_items:
-    - check-mk-agent
-    - nagios-plugins-basic
+  apt:
+    state: present
+    name: [
+      'check-mk-agent',
+      'nagios-plugins-basic',
+    ]
 
 - name: install Debian packages for Check_MK agent (2/2)
   tags:
@@ -19,17 +19,18 @@
     - monitoring
     - packages
   apt: >
-    state=installed
+    state=present
     name=check-mk-agent-logwatch
-  when: "ansible_distribution_major_version >= '7'"
+  when: "ansible_distribution_major_version|int >= 7 and ansible_distribution_major_version|int < 9"
 
 - name: test for systemd unit files
   tags:
     - check_mk
     - monitoring
     - packages
+    - systemd
   stat: path=/etc/systemd/system/check_mk.socket
-  when: "ansible_distribution_major_version >= '8'"
+  when: "ansible_distribution_major_version|int >= 8"
   check_mode: no
   register: check_mk_socket_unit
 
@@ -44,7 +45,7 @@
     mode=0644
     owner=root
     src=check_mk.socket.j2
-  when: ansible_distribution_major_version >= '8' and check_mk_socket_unit.stat.exists == False
+  when: ansible_distribution_major_version|int >= 8 and check_mk_socket_unit.stat.exists == False
   notify:
     - reload systemd daemon
 
@@ -59,7 +60,7 @@
     mode=0644
     owner=root
     src=check_mk@.service.j2
-  when: ansible_distribution_major_version >= '8' and check_mk_socket_unit.stat.exists == False
+  when: ansible_distribution_major_version|int >= 8 and check_mk_socket_unit.stat.exists == False
   notify:
     - reload systemd daemon
 
@@ -73,16 +74,13 @@
     owner=root
     regexp="^[\s]*disable[\s]*="
     state=absent
-  when: "ansible_distribution_major_version < '8'"
+  when: "ansible_distribution_major_version|int < 8"
   notify:
     - restart "xinetd"
 
 - meta: flush_handlers
   tags:
     - check_mk
-    - monitoring
-    - packages
-    - systemd
 
 - name: ensure "check_mk.socket" is enabled and started
   tags:
@@ -92,4 +90,4 @@
     enabled=yes
     name=check_mk.socket
     state=started
-  when: "ansible_distribution_major_version >= '8'"
+  when: "ansible_distribution_major_version|int >= 8"