From f3098580fb35a64e716537eaf42c07c9f1cbcaca Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Wed, 18 Nov 2020 10:28:22 -0800
Subject: [PATCH] koji_builder / kojid: fix template to work on hosts with both
 runroot and containerbuild

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

diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf
index 304e498d9c..c728f8dc8b 100644
--- a/roles/koji_builder/templates/kojid.conf
+++ b/roles/koji_builder/templates/kojid.conf
@@ -144,13 +144,11 @@ keytab = /etc/kojid/kojid.keytab
 {% set plugins = [] %}
 
 {% if 'runroot' in group_names %}
-{% set plugins = ['runroot'] %}
-{% else %}
-
-{% if ansible_architecture == 'x86_64' and not inventory_hostname.startswith('bkernel') %}
-{% set plugins = ['builder_containerbuild'] %}
+{% plugins.append = ['runroot'] %}
 {% endif %}
 
+{% if ansible_architecture == 'x86_64' and not inventory_hostname.startswith('bkernel') %}
+{% plugins.append = ['builder_containerbuild'] %}
 {% endif %}
 
 {% if env == 'staging' %}