From a385778b23e9cac6b7acca0344e58b07c274c22c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 2 Mar 2016 18:28:49 +0000 Subject: [PATCH] Conditionalize the containerbuild stuff --- roles/koji_builder/templates/kojid.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 69e7f01f46..9270cf774f 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -72,7 +72,11 @@ serverca = /etc/kojid/cacert.pem {% if 'runroot' in group_names %} ; Config for it lives in /etc/kojid/runroot.conf +{% if env == 'staging' %} plugins = runroot builder_container +{% else %} +plugins = runroot +{% endif %} ; We use the hub's plugin path since that's where ; the package installs the builder plugin. @@ -80,6 +84,10 @@ pluginpath = /usr/lib/koji-hub-plugins {% else %} +{% if env == 'staging' %} plugins = builder_container +{% else %} +plugins = +{% endif %} {% endif %}