From a7665c9fe10ce4df1f407d0eeccf213866385988 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 25 Sep 2019 19:09:54 +0000
Subject: [PATCH] koji_builder: Drop keepalive kojid directive as it's gone in
 1.18.0.

Also drop in prod when we upgrade it.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/koji_builder/templates/kojid.conf | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 8410c2b415..574865ed19 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -17,7 +17,11 @@ maxjobs=25
 ; topdir=/mnt/koji
 
 ; Disable keepalive for now since it's not working in f23.
+{% if env == 'staging' %}
+; keepalive removed in 1.18.0
+{% else %}
 keepalive=False
+{% endif %}
 
 rpmbuild_timeout=201600