From 11e384a8c3444edd3e32b407e9b3cf05cb454223 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 27 Feb 2018 00:57:34 +0000
Subject: [PATCH] lets try and install oz/imagefactory on s390x builders too

---
 roles/koji_builder/tasks/main.yml | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 038e3efb17..23844d2736 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -96,34 +96,11 @@
     - pykickstart
   tags:
   - koji_builder
-  when: ansible_architecture != 's390x'
-
-- name: add pkgs (s390x)
-  dnf: state=present pkg={{ item }}
-  with_items:
-    - yum-utils
-    - koji-builder
-    - python-osbs-client
-    - koji-containerbuild-builder
-    - strace
-    - mock
-    - kernel-firmware
-    - ntp
-    - ntpdate
-    - rsyslog
-    - audit
-    - pycdio
-    - python-kickstart
-    - pykickstart
-  tags:
-  - koji_builder
-  when: ansible_architecture == 's390x'
 
 - name: enable virtlogd service
   service: name=virtlogd state=started enabled=yes
   tags:
   - koji_builder
-  when: ansible_distribution_major_version|int > 23 and ansible_architecture != 's390x'
 
 - name: build /etc/kojid/kojid.conf from group vars
   template: src=kojid.conf dest=/etc/kojid/kojid.conf
@@ -168,7 +145,6 @@
   copy: src={{ private }}/files/koji/config.yaml dest=/root/.psphere/config.yaml
   tags:
   - koji_builder
-  when: ansible_architecture != 's390x'
 # done oz/imagefactory
 
 - name: copy over /etc/security/limits.conf
@@ -179,7 +155,6 @@
 # oz.cfg  upstream ram and cpu definitions are not enough
 - name: oz.cfg
   copy: src=oz.cfg dest=/etc/oz/oz.cfg
-  when: not inventory_hostname.startswith('buildvm-s390x')
   tags:
   - koji_builder
 
@@ -194,7 +169,6 @@
   - restart libvirtd
   tags:
   - koji_builder
-  when: ansible_architecture != 's390x'
 
 #
 # On primary we want to make a /mnt/koji link to /mnt/fedora_koji/koji