From: Alexander Barton <alexander.barton@thomas-daily.de>
Date: Mon, 18 Mar 2019 17:59:33 +0000 (+0100)
Subject: Use integer comparision when dealing with "ansible_distribution_major_version"
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=AnsibleRoles.git;a=commitdiff_plain;h=455a8c989340ca74765c35562c8f5a52115b375b

Use integer comparision when dealing with "ansible_distribution_major_version"
---

diff --git a/roles/check-mk-agent/meta/main.yml b/roles/check-mk-agent/meta/main.yml
index 3d3b0eb..d08cb30 100644
--- a/roles/check-mk-agent/meta/main.yml
+++ b/roles/check-mk-agent/meta/main.yml
@@ -3,4 +3,4 @@
 
 dependencies:
   - { role: os-base }
-  - { role: xinetd, when: "ansible_distribution_major_version < '8'" }
+  - { role: xinetd, when: "ansible_distribution_major_version|int < 8" }
diff --git a/roles/check-mk-agent/tasks/main.yml b/roles/check-mk-agent/tasks/main.yml
index 90fa5af..1221c44 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|int >= 7 and ansible_distribution_major_version < '9'"
+  when: "ansible_distribution_major_version|int >= 7 and ansible_distribution_major_version|int < 9"
 
 - name: test for systemd unit files
   tags:
diff --git a/roles/nfs-client/defaults/main.yml b/roles/nfs-client/defaults/main.yml
index a043a05..1381418 100644
--- a/roles/nfs-client/defaults/main.yml
+++ b/roles/nfs-client/defaults/main.yml
@@ -3,4 +3,4 @@
 
 nfs_client_domain: "{{ ansible_domain }}"
 
-rpc_pipefs: "{{ '/var/lib/nfs/rpc_pipefs' if ansible_distribution_major_version < '8' else '/run/rpc_pipefs' }}"
+rpc_pipefs: "{{ '/var/lib/nfs/rpc_pipefs' if ansible_distribution_major_version|int < 8 else '/run/rpc_pipefs' }}"
diff --git a/roles/nfs-client/handlers/main.yml b/roles/nfs-client/handlers/main.yml
index 2e1845d..3513fc5 100644
--- a/roles/nfs-client/handlers/main.yml
+++ b/roles/nfs-client/handlers/main.yml
@@ -5,4 +5,4 @@
   service: >
     name=nfs-common
     state=restarted
-  when: "ansible_distribution_major_version < '8'"
+  when: "ansible_distribution_major_version|int < 8"
diff --git a/roles/nfs-client/tasks/main.yml b/roles/nfs-client/tasks/main.yml
index c8bf548..320c683 100644
--- a/roles/nfs-client/tasks/main.yml
+++ b/roles/nfs-client/tasks/main.yml
@@ -29,4 +29,4 @@
     enabled=yes
     name=nfs-common
     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 6b0364d..657403f 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|int >= '8'"
+  when: "ansible_distribution == 'Debian' and ansible_distribution_major_version|int >= 8"