diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index b4371e92c2..1f9b83a0bf 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -85,11 +85,11 @@ action: service name=openvpn@openvpn state=restarted - name: restart openvpn (RHEL6) - when: ansible_distribution == "RedHat" and ansible_distribution_major_version == "6" + when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 6 action: service name=openvpn state=restarted - name: restart openvpn (RHEL7) - when: ansible_distribution == "RedHat" and ansible_distribution_major_version == "7" + when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 7 action: service name=openvpn@openvpn state=restarted - name: restart postfix diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 8aef205828..c6612136e2 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index a27a374f21..6ed73e9263 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 601b7ebf59..7605bb90d0 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 48f58c5088..7a7ab3dfef 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/beaker-virthosts.yml b/playbooks/groups/beaker-virthosts.yml index e17c07f7b9..295e114df1 100644 --- a/playbooks/groups/beaker-virthosts.yml +++ b/playbooks/groups/beaker-virthosts.yml @@ -17,7 +17,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index fa05184ddc..bec5ceb4d0 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -27,7 +27,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index c548409816..eab0844bfc 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -27,7 +27,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 9f4f2f7d6d..126e07be34 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -29,7 +29,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 4882c0d306..be4b3d1d54 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -45,14 +45,14 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client - collectd/base - apache - download - - { role: mod_limitipconn, when: ansible_distribution_major_version != '7'} + - { role: mod_limitipconn, when: ansible_distribution_major_version|int != '7'} - rsyncd - { role: nfs/client, when: datacenter == "phx2", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - { role: nfs/client, when: datacenter == "rdu", mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 4b4a9137d0..b943d3428f 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -27,7 +27,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 33e8deb0a2..4e5664040d 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -30,7 +30,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - fas_client - nagios_client - hosts diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index d1c5604ea5..00e975d27a 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 07302b1717..de608aa51c 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index 01e817314c..0adca68120 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - collectd/base - hosts diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 59f4b2d52f..410966b0f2 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -58,7 +58,7 @@ - java-1.8.0-openjdk tags: - packages - when: ansible_distribution_major_version != '7' + when: ansible_distribution_major_version|int != 7 - name: add jenkins proxy config file for apache action: copy src="{{ files }}/jenkins/master/jenkins-apache.conf" @@ -406,7 +406,7 @@ - name: install pkgs for jenkins for fedora systems > F19 action: yum state=present pkg={{ item }} - when: is_fedora is defined and ansible_distribution_major_version > 20 + when: is_fedora is defined and ansible_distribution_major_version|int > 20 with_items: - sbt-extras diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 6bde1c2a56..60501f14fe 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 22e07ef3df..9778ba82d5 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -31,7 +31,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index a313a4bff5..d789df0724 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -33,7 +33,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - fas_client - nagios_client - hosts diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 259ae0f31f..1d3befee38 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -27,7 +27,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index b7cefaf1c5..9e8105ab00 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - hosts - fas_client - nagios_client diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index edec189dbe..6dca4fc3c7 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 51c0ddf134..8c5524bd2a 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 8b3c68a963..40bfcb93dc 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -39,7 +39,7 @@ - rkhunter - rsyncd - sudo - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - { role: openvpn/client, when: env != "staging" } - { role: collectd/fedmsg-service, process: fedmsg-hub } - apache diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 08c8e152d9..e46dd55958 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 75147bb72a..b9372eb18b 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -27,7 +27,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - fas_client - collectd/base diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index a151cb58a4..ef66ce975e 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -33,7 +33,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - fas_client - nagios_client - hosts diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index 959b0d1cc8..11375228b0 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -14,7 +14,7 @@ - hosts - fas_client - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - sudo - fedmsg/base diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 7332e64e08..7468f8b5bb 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -29,7 +29,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index 8bc1e16b24..a503723aa4 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - collectd/base - hosts diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index cec3cb54e2..ed5b57277b 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -32,7 +32,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index b9643cb238..7025acab01 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -15,7 +15,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index 7895685aa9..00c36389ba 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -13,7 +13,7 @@ roles: - base - rkhunter - - { role: denyhosts, when: ansible_distribution_major_version != '7' } + - { role: denyhosts, when: ansible_distribution_major_version|int != 7 } - nagios_client - hosts - fas_client diff --git a/playbooks/transient_cloud_instance.yml b/playbooks/transient_cloud_instance.yml index fa0ef3c9da..cffa7cac44 100644 --- a/playbooks/transient_cloud_instance.yml +++ b/playbooks/transient_cloud_instance.yml @@ -56,11 +56,11 @@ tasks: - name: install cloud-utils (yum) yum: pkg=cloud-utils state=present - when: ansible_distribution_major_version < '22' + when: ansible_distribution_major_version|int < 22 - name: install cloud-utils (dnf) command: dnf install -y cloud-utils - when: ansible_distribution_major_version > '21' and ansible_cmdline.ostree is not defined + when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/roles/apache/tasks/main.yml b/roles/apache/tasks/main.yml index 1b941a98e5..d8222bb7ba 100644 --- a/roles/apache/tasks/main.yml +++ b/roles/apache/tasks/main.yml @@ -31,7 +31,7 @@ - name: hotfix - copy over new httpd sysconfig (el6) copy: src="{{ files }}/hotfix/httpd/httpd.sysconfig" dest=/etc/sysconfig/httpd - when: ansible_distribution_major_version == '6' + when: ansible_distribution_major_version|int == 6 notify: - restart apache tags: @@ -41,7 +41,7 @@ - name: hotfix - copy over new httpd sysconfig (el7) copy: src="{{ files }}/hotfix/httpd/httpd.sysconfig" dest=/etc/sysconfig/httpd - when: ansible_distribution_major_version == '7' + when: ansible_distribution_major_version|int == 7 notify: - restart apache tags: diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 669d028abe..1367c15e2d 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -27,11 +27,11 @@ - packages - base -- debug: msg="{{ansible_nodename}} {{inventory_hostname}} {{ansible_distribution_major_version}}" +- debug: msg="{{ansible_nodename}} {{inventory_hostname}} {{ansible_distribution_major_version|int}}" - name: make sure hostname is set right on rhel7 hosts command: hostnamectl set-hostname {{ inventory_hostname }} - when: ( ansible_nodename != inventory_hostname ) and ansible_distribution_major_version == '7' + when: ( ansible_nodename != inventory_hostname ) and ansible_distribution_major_version|int == 7 - name: sshd_config copy: src={{ item }} dest=/etc/ssh/sshd_config mode=600 diff --git a/roles/beaker/virthost/tasks/main.yml b/roles/beaker/virthost/tasks/main.yml index 1357d9857d..15b1eb6ed8 100644 --- a/roles/beaker/virthost/tasks/main.yml +++ b/roles/beaker/virthost/tasks/main.yml @@ -16,7 +16,7 @@ - virt-install tags: - packages - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 # install libvirtd.conf # @@ -45,7 +45,7 @@ - restart bridge tags: - config - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 - name: generate config for ethernet device template: diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml index a59b828a8f..3dedda2f88 100644 --- a/roles/collectd/base/tasks/main.yml +++ b/roles/collectd/base/tasks/main.yml @@ -97,7 +97,7 @@ - name: copy over our pstorefs/collectd selinux module (rhel6 has no pstorefs) copy: src=selinux/fi-pstorefs.pp dest=/usr/share/collectd/fi-pstorefs.pp - when: ansible_distribution_major_version != '6' + when: ansible_distribution_major_version|int != 6 register: ficpstorefs_module tags: - collectd @@ -105,7 +105,7 @@ - name: check to see if its even installed yet shell: semodule -l | grep fi-pstorefs | wc -l - when: ansible_distribution_major_version != '6' + when: ansible_distribution_major_version|int != 6 register: ficpstorefs_grep always_run: true changed_when: "'0' in ficpstorefs_grep.stdout" @@ -115,7 +115,7 @@ - name: install our pstorefs/collectd selinux module command: semodule -i /usr/share/collectd/fi-pstorefs.pp - when: ansible_distribution_major_version != '6' and (ficpstorefs_module|changed or ficpstorefs_grep|changed) + when: ansible_distribution_major_version|int != 6 and (ficpstorefs_module|changed or ficpstorefs_grep|changed) tags: - collectd - selinux diff --git a/roles/fas_client/tasks/main.yml b/roles/fas_client/tasks/main.yml index ffa074dbb1..7b22966fd5 100644 --- a/roles/fas_client/tasks/main.yml +++ b/roles/fas_client/tasks/main.yml @@ -19,7 +19,7 @@ - name: install nss_db on rhel hosts only yum: state=present name=nss_db - when: is_rhel is defined and ansible_distribution_major_version == '6' + when: is_rhel is defined and ansible_distribution_major_version|int == 6 tags: - packages - fas_client diff --git a/roles/fedmsg/base/tasks/main.yml b/roles/fedmsg/base/tasks/main.yml index e20d2cae68..cf31a70056 100644 --- a/roles/fedmsg/base/tasks/main.yml +++ b/roles/fedmsg/base/tasks/main.yml @@ -24,7 +24,7 @@ owner=fedmsg group=fedmsg state=directory - when: ansible_distribution_major_version == '6' + when: ansible_distribution_major_version|int == 6 tags: - fedmsg/base diff --git a/roles/git/server/tasks/main.yml b/roles/git/server/tasks/main.yml index 683da96acc..f95ba428b6 100644 --- a/roles/git/server/tasks/main.yml +++ b/roles/git/server/tasks/main.yml @@ -7,25 +7,25 @@ # If NOT using xinetd - name: delete stock git daemon config file: path="/usr/lib/systemd/system/git.service" state=absent - when: ansible_distribution_major_version == '7' + when: ansible_distribution_major_version|int == 7 - name: configure git daemon template: > src="git@.service.j2" dest="/usr/lib/systemd/system/git@.service" mode=0644 - when: ansible_distribution_major_version == '7' + when: ansible_distribution_major_version|int == 7 # If using xinetd - name: install xinetd yum: pkg=xinetd state=present - when: ansible_distribution_major_version == '6' + when: ansible_distribution_major_version|int == 6 - name: install the xinetd config file template: > src="git.j2" dest="/etc/xinetd.d/git" mode=0644 - when: ansible_distribution_major_version == '6' + when: ansible_distribution_major_version|int == 6 notify: - restart xinetd diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index f893f6dcbf..e07a72795e 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -231,7 +231,7 @@ register: max_loop always_run: yes changed_when: '1 != 1' - when: ansible_distribution_major_version != '6' and ansible_architecture == 'x86_64' + when: ansible_distribution_major_version|int != 6 and ansible_architecture == 'x86_64' tags: - koji_builder @@ -240,7 +240,7 @@ register: max_loop always_run: yes changed_when: '1 != 1' - when: ansible_distribution == 'RedHat' and ansible_architecture == 'x86_64' and ansible_distribution_major_version == '6' + when: ansible_distribution == 'RedHat' and ansible_architecture == 'x86_64' and ansible_distribution_major_version|int == 6 tags: - koji_builder @@ -259,7 +259,7 @@ yum: state=present pkg={{ item }} with_items: - kmod-hfsplus - when: is_rhel is defined and ansible_architecture == 'x86_64' and ansible_distribution_major_version == '6' + when: is_rhel is defined and ansible_architecture == 'x86_64' and ansible_distribution_major_version|int == '6' tags: - koji_builder diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 0b5642f6fb..3d228793f7 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -235,14 +235,14 @@ tags: - selinux - koji_hub - when: ansible_distribution == "RedHat" and ansible_distribution_major_version == "6" + when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 6 - name: set sebooleans so koji can anon write seboolean: name=httpd_anon_write state=true persistent=true tags: - selinux - koji_hub - when: ansible_distribution == "RedHat" and ansible_distribution_major_version == "7" + when: ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 7 - name: Set httpd to run on boot service: name=httpd enabled=yes diff --git a/roles/memcached/tasks/main.yml b/roles/memcached/tasks/main.yml index 7070bcd346..46ad1af03b 100644 --- a/roles/memcached/tasks/main.yml +++ b/roles/memcached/tasks/main.yml @@ -24,7 +24,7 @@ file: state=directory path=/etc/systemd/system/memcached.service.d mode=0755 owner=root group=root tags: - memcached - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 - name: make systemd override config copy: src=memcached-systemdoverride.conf dest=/etc/systemd/system/memcached.service.d/ @@ -32,4 +32,4 @@ - memcached notify: - reload systemd - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 diff --git a/roles/nagios_client/tasks/main.yml b/roles/nagios_client/tasks/main.yml index cb0a410f6e..c7cc038468 100644 --- a/roles/nagios_client/tasks/main.yml +++ b/roles/nagios_client/tasks/main.yml @@ -58,7 +58,7 @@ - name: install our custom selinux module command: semodule -i /usr/share/nrpe/fi-nrpe.pp - when: ansible_distribution_major_version == '7' and selinux_module|changed + when: ansible_distribution_major_version|int == 7 and selinux_module|changed # Set up our base config. diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index 1a4f4839ba..57f322e037 100644 --- a/roles/nfs/client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml @@ -30,14 +30,14 @@ with_items: - rpcbind - nfs-lock - when: ansible_distribution == 'Fedora' and ansible_distribution_major_version == '20' + when: ansible_distribution == 'Fedora' and ansible_distribution_major_version|int == 20 - name: enable nfs-related services and run them (rhel7) service: name={{ item }} enabled=true state=started with_items: - rpcbind - nfs-lock - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 - name: enable nfs-related services and run them (rhel6) action: service name={{ item }} enabled=true state=started @@ -46,7 +46,7 @@ - rpcbind - nfs - nfslock - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '6' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 6 - name: nfs mount points (phx2) mount: > diff --git a/roles/openvpn/client/tasks/main.yml b/roles/openvpn/client/tasks/main.yml index 320d3a7ff4..7b59fc425e 100644 --- a/roles/openvpn/client/tasks/main.yml +++ b/roles/openvpn/client/tasks/main.yml @@ -33,14 +33,14 @@ - name: enable openvpn service for rhel 6 service: name=openvpn state=running enabled=true - when: ansible_distribution_major_version == '6' + when: ansible_distribution_major_version|int == 6 tags: - service - openvpn - name: Make sure openvpn is running in rhel 7.1 service: name=openvpn@openvpn state=running enabled=true - when: ansible_distribution_major_version == '7' + when: ansible_distribution_major_version|int == 7 tags: - service - openvpn diff --git a/tasks/cloud_setup_basic.yml b/tasks/cloud_setup_basic.yml index d832dc6f15..9784830e74 100644 --- a/tasks/cloud_setup_basic.yml +++ b/tasks/cloud_setup_basic.yml @@ -7,7 +7,7 @@ - ntp - libsemanage-python - libselinux-python - when: ansible_distribution_major_version < '22' + when: ansible_distribution_major_version|int < 22 tags: - packages @@ -56,14 +56,14 @@ - name: update all command: yum -y update creates=/etc/sysconfig/global-update-applied register: updated - when: ansible_distribution_major_version < '22' + when: ansible_distribution_major_version|int < 22 tags: - packages - name: update all command: dnf -y update creates=/etc/sysconfig/global-update-applied register: updated - when: ansible_distribution_major_version > '21' and ansible_cmdline.ostree is not defined + when: ansible_distribution_major_version|int > 21 and ansible_cmdline.ostree is not defined tags: - packages diff --git a/tasks/virthost.yml b/tasks/virthost.yml index d877c007f8..6dc7e36723 100644 --- a/tasks/virthost.yml +++ b/tasks/virthost.yml @@ -12,7 +12,7 @@ - python-virtinst tags: - packages - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '6' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 6 - name: install libvirt packages on rhel7 virthosts yum: pkg={{ item }} state=present @@ -22,7 +22,7 @@ - virt-install tags: - packages - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 # install libvirtd.conf # @@ -50,4 +50,4 @@ - restart bridge tags: - config - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 diff --git a/tasks/yumrepos.yml b/tasks/yumrepos.yml index 25a21f8c7b..d88fd3e9dd 100644 --- a/tasks/yumrepos.yml +++ b/tasks/yumrepos.yml @@ -4,7 +4,7 @@ with_items: - epel6.repo - rhel6.repo - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '6' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 6 tags: - config - packages @@ -15,7 +15,7 @@ with_items: - epel7.repo - rhel7.repo - when: ansible_distribution == 'RedHat' and ansible_distribution_major_version == '7' + when: ansible_distribution == 'RedHat' and ansible_distribution_major_version|int == 7 tags: - config - packages