From 23fd6acb25712c8c5b4f7d25bc584e852a87b23c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 13 Jun 2015 01:05:57 +0000 Subject: [PATCH] Don't try and enable the runroot plugin on builders that don't have it installed. This was causing all non runroot builders to never be ready because they couldn't load the plugin. --- roles/koji_builder/templates/kojid.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index c6e330ba1e..9bb9a29dc1 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -63,10 +63,11 @@ ca = /etc/kojid/cacert.pem ;certificate of the CA that issued the HTTP server certificate serverca = /etc/kojid/cacert.pem -; Let's try the runroot plugin in staging. +{% if 'runroot' in group_names %} ; Config for it lives in /etc/kojid/runroot.conf plugins = runroot ; We use the hub's plugin path since that's where ; the package installs the builder plugin. pluginpath = /usr/lib/koji-hub-plugins +{% endif %}