From 2cbc7a3c0432caf823289263a4c2a277b5028bf4 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 7 Dec 2015 08:21:15 +0000
Subject: [PATCH] koji_builder: no need to special case the PPC builders
 anymore

---
 roles/koji_builder/tasks/main.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index c06d983905..53642e0b3a 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -79,13 +79,6 @@
     - ntpdate
     - rsyslog
     - audit
-  tags:
-  - koji_builder
-  when: ansible_distribution_major_version|int < 22
-
-- name: add oz/imagefctory pkgs on all but PPC EPEL
-  yum: state=present pkg={{ item }}
-  with_items:
     - oz
     - imagefactory
     - imagefactory-plugins-TinMan
@@ -99,9 +92,9 @@
     - python-psphere
     - VMDKstream
     - pykickstart
-  when: not inventory_hostname.startswith('buildppc-') and ansible_distribution_major_version|int < 22
   tags:
   - koji_builder
+  when: ansible_distribution_major_version|int < 22
 
 - name: add pkgs
   dnf: state=present pkg={{ item }}
@@ -117,13 +110,6 @@
     - audit
     - pycdio
     - python-kickstart
-  tags:
-  - koji_builder
-  when: ansible_distribution_major_version|int > 21
-
-- name: add oz/imagefctory pkgs on all but PPC EPEL
-  dnf: state=present pkg={{ item }}
-  with_items:
     - oz
     - imagefactory
     - imagefactory-plugins-TinMan
@@ -137,9 +123,9 @@
     - python-psphere
     - VMDKstream
     - pykickstart
-  when: not inventory_hostname.startswith('buildppc-') and ansible_distribution_major_version|int > 21
   tags:
   - koji_builder
+  when: ansible_distribution_major_version|int > 21
 
 - name: build /etc/kojid/kojid.conf from group vars
   template: src=kojid.conf dest=/etc/kojid/kojid.conf