From 4244352e8a59a1f96f4654ba93cb6c55b8050f59 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 4 Nov 2016 21:25:26 +0000
Subject: [PATCH 1/3] Simplify the logic around /mnt/koji links. We need to fix
 the new ppc hosts as they got the alternative arch config for this link.
 Staging should also follow primary on this.

---
 roles/koji_builder/tasks/main.yml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index 880ecbd0a1..ac7329a7bf 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -166,21 +166,24 @@
   tags:
   - koji_builder
 
+#
+# On primary we want to make a /mnt/koji link to /mnt/fedora_koji/koji
+#
+
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
-  when: inventory_hostname.startswith(('build','arm04-builder00','arm04-builder01','arm02-builder21','arm02-builder23')) and not inventory_hostname.startswith(('buildvm-ppc64','buildvm-s390'))
+  when: koji_hub_nfs == "fedora_koji"
   tags:
   - koji_builder
 
+#
+# alternative arch builders however want to link to just /mnt/fedora_koji
+#
+
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji dest=/mnt/koji
   when: inventory_hostname.startswith(('aarch64','ppc8','buildvm-ppc64','buildvm-s390'))
-  tags:
-  - koji_builder
-
-- name: make a mnt/koji link
-  file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
-  when: "'builders-stg' in group_names"
+  when: koji_hub_nfs != "fedora_koji"
   tags:
   - koji_builder
 

From 732a067ecc853d09a42602d97d97d5295282c0bf Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 4 Nov 2016 21:35:23 +0000
Subject: [PATCH 2/3] drop old duplicate line

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

diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index ac7329a7bf..fc5c4ee181 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -182,7 +182,6 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji dest=/mnt/koji
-  when: inventory_hostname.startswith(('aarch64','ppc8','buildvm-ppc64','buildvm-s390'))
   when: koji_hub_nfs != "fedora_koji"
   tags:
   - koji_builder

From e93844c2cd872b6f4d1a7c8adcec4ce0a4d8f20f Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Fri, 4 Nov 2016 21:40:52 +0000
Subject: [PATCH 3/3] need to protect against this being undefined on builders
 that are not doing createrepo jobs like arm01/02/04 and bkernel01/02

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

diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml
index fc5c4ee181..7f4e0ced35 100644
--- a/roles/koji_builder/tasks/main.yml
+++ b/roles/koji_builder/tasks/main.yml
@@ -172,7 +172,7 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji
-  when: koji_hub_nfs == "fedora_koji"
+  when: koji_hub_nfs is defined and koji_hub_nfs == "fedora_koji"
   tags:
   - koji_builder
 
@@ -182,7 +182,7 @@
 
 - name: make a mnt/koji link
   file: state=link src=/mnt/fedora_koji dest=/mnt/koji
-  when: koji_hub_nfs != "fedora_koji"
+  when: koji_hub_nfs is defined and koji_hub_nfs != "fedora_koji"
   tags:
   - koji_builder