From 85452e2af48e15a73111ec434e29520bc3577e27 Mon Sep 17 00:00:00 2001
From: George T Kramer <george.t.kramer@intel.com>
Date: Mon, 4 Mar 2019 17:36:19 -0800
Subject: [PATCH] Make setup for koji NFS mounting easier

When koji builder and koji master are hosted on different machines, NFS
mounting is needed to connect the services.  Make this process more
smooth to minimize manual editing of files.  Namely, change the top
directory that koji looks at.  If on the master, this is on the local
file system.  If on the builder not on the master, this is also on the
local file system, but is backed by a NFS mount in a different location.

Signed-off-by: George T Kramer <george.t.kramer@intel.com>
---
 koji-setup/deploy-koji-builder.sh    | 7 ++++++-
 koji-setup/deploy-koji-nfs-client.sh | 1 -
 koji-setup/parameters.sh             | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/koji-setup/deploy-koji-builder.sh b/koji-setup/deploy-koji-builder.sh
index 2e0a585..2a1b5eb 100755
--- a/koji-setup/deploy-koji-builder.sh
+++ b/koji-setup/deploy-koji-builder.sh
@@ -20,12 +20,17 @@ useradd -r kojibuilder
 usermod -G mock kojibuilder
 
 # Kojid Configuration Files
+if [[ "$KOJI_SLAVE_FQDN" = "$KOJI_MASTER_FQDN" ]]; then
+	KOJI_TOP_DIR="$KOJI_DIR"
+else
+	KOJI_TOP_DIR="$KOJI_MOUNT_DIR"
+fi
 mkdir -p /etc/kojid
 cat > /etc/kojid/kojid.conf <<- EOF
 [kojid]
 sleeptime=5
 maxjobs=16
-topdir=$KOJI_DIR
+topdir=$KOJI_TOP_DIR
 workdir=/tmp/koji
 mockdir=/var/lib/mock
 mockuser=kojibuilder
diff --git a/koji-setup/deploy-koji-nfs-client.sh b/koji-setup/deploy-koji-nfs-client.sh
index b9fd263..2274166 100755
--- a/koji-setup/deploy-koji-nfs-client.sh
+++ b/koji-setup/deploy-koji-nfs-client.sh
@@ -7,7 +7,6 @@ SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 source "$SCRIPT_DIR"/globals.sh
 source "$SCRIPT_DIR"/parameters.sh
 
-KOJI_MOUNT_DIR=/mnt/koji
 KOJI_MOUNT_SERVICE="${KOJI_MOUNT_DIR:1}"
 KOJI_MOUNT_SERVICE="${KOJI_MOUNT_SERVICE/\//-}".mount
 mkdir -p /etc/systemd/system
diff --git a/koji-setup/parameters.sh b/koji-setup/parameters.sh
index 6167544..ccf0fd8 100644
--- a/koji-setup/parameters.sh
+++ b/koji-setup/parameters.sh
@@ -4,6 +4,7 @@
 
 ## KOJI RPM BUILD AND TRACKER
 export KOJI_DIR=/srv/koji
+export KOJI_MOUNT_DIR=/mnt/koji
 export KOJI_MASTER_FQDN="$(hostname -f)"
 export KOJI_URL=https://"$KOJI_MASTER_FQDN"
 export KOJI_MOUNT_DIR=/mnt/koji