From 0dd4dd5acc423672dd30a554d1f4aa336aed90bd Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 30 Jul 2016 19:29:05 +0000
Subject: [PATCH] rework conditionals

---
 roles/jenkins/slave/tasks/main.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/roles/jenkins/slave/tasks/main.yml b/roles/jenkins/slave/tasks/main.yml
index 5f317bf8c7..c5bab37273 100644
--- a/roles/jenkins/slave/tasks/main.yml
+++ b/roles/jenkins/slave/tasks/main.yml
@@ -19,16 +19,7 @@
 - name: install distro-specific slave packages (fedora, dnf)
   dnf: name={{ item }} state=installed
   with_items: "{{ slave_packages_fedora }}"
-  when: is_fedora is defined and ansible_distribution_major_version|int > 21
-  tags:
-  - jenkins
-  - jenkins/slave
-  - packages
-
-- name: install distro-specific slave packages (fedora, yum)
-  yum: name={{ item }} state=installed
-  with_items: "{{ slave_packages_fedora }}"
-  when: is_fedora is defined and ansible_distribution_major_version|int < 22
+  when: ansible_distribution_major_version|int > 21
   tags:
   - jenkins
   - jenkins/slave
@@ -37,7 +28,7 @@
 - name: install distro-specific slave packages (centos, yum)
   yum: name={{ item }} state=installed
   with_items: "{{ slave_packages_centos }}"
-  when: is_fedora is not defined
+  when: ansible_distribution_major_version|int < 8
   tags:
   - jenkins
   - jenkins/slave