From 5b2c46acdbadbb36b45124b9a29487d83dc93735 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 31 May 2018 16:40:43 +0000
Subject: [PATCH] just apply the oz timeout all around

---
 roles/koji_builder/templates/kojid.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index d576938286..d582eced1d 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -21,12 +21,10 @@ keepalive=False
 
 rpmbuild_timeout=172800
 
-{% if ansible_hostname.startswith(('buildvm-s390x-02','buildhw-aarch64-0')) %}
-; Set oz timeout higher on x390x image builder to allow it to finish.
+; Set oz timeout higher to allow aarch64, ppc64{le} and s390x to finish.
 ; Install timeout(seconds) for image build
 ; if it's unset, use the number in /etc/oz/oz.cfg, supported since oz-0.16.0
 oz_install_timeout=14400
-{% endif %}
 use_createrepo_c=True
 
 {% if host in groups['buildvm-s390x'] %}