From 595cfa0408f0ae0d97dea0e60f4f4d9be57cb134 Mon Sep 17 00:00:00 2001
From: Alexander Barton <alex@barton.de>
Date: Tue, 16 Oct 2018 16:01:58 +0200
Subject: [PATCH] Correctly cast variables to integers in Jinja templates

This is required for the Ansible configuration to become compatible
with Python 3.
---
 roles/check-mk-agent/tasks/main.yml | 12 ++++++------
 roles/os-base/handlers/main.yml     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/check-mk-agent/tasks/main.yml b/roles/check-mk-agent/tasks/main.yml
index 3e5ffc0..3bfc39d 100644
--- a/roles/check-mk-agent/tasks/main.yml
+++ b/roles/check-mk-agent/tasks/main.yml
@@ -21,7 +21,7 @@
   apt: >
     state=present
     name=check-mk-agent-logwatch
-  when: "ansible_distribution_major_version >= '7' and ansible_distribution_major_version < '9'"
+  when: "ansible_distribution_major_version|int >= 7 and ansible_distribution_major_version < '9'"
 
 - name: test for systemd unit files
   tags:
@@ -29,7 +29,7 @@
     - monitoring
     - packages
   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 +44,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 +59,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,7 +73,7 @@
     owner=root
     regexp="^[\s]*disable[\s]*="
     state=absent
-  when: "ansible_distribution_major_version < '8'"
+  when: "ansible_distribution_major_version|int < 8"
   notify:
     - restart "xinetd"
 
@@ -92,4 +92,4 @@
     enabled=yes
     name=check_mk.socket
     state=started
-  when: "ansible_distribution_major_version >= '8'"
+  when: "ansible_distribution_major_version|int >= 8"
diff --git a/roles/os-base/handlers/main.yml b/roles/os-base/handlers/main.yml
index 92b2b27..6b0364d 100644
--- a/roles/os-base/handlers/main.yml
+++ b/roles/os-base/handlers/main.yml
@@ -7,4 +7,4 @@
     - systemd
   systemd: >
     daemon_reload=yes
-  when: "ansible_distribution == 'Debian' and ansible_distribution_major_version >= '8'"
+  when: "ansible_distribution == 'Debian' and ansible_distribution_major_version|int >= '8'"
-- 
2.39.2