From bce67dcb91b27681ed5d6fed015d872fb15c1ac9 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 17 Jan 2018 18:46:23 +0000 Subject: [PATCH] Revert "Enable runroot on all stg buildvms" This reverts commit 2703eb8a648e46f2f40280cb9d93a44a43e9a02c. --- roles/koji_builder/templates/kojid.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 13bc95e495..832d80c3a0 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -128,9 +128,6 @@ keytab = /etc/kojid/kojid.keytab krbservice = host krb_rdns = false -{% if env == 'staging' %} -plugins = runroot{% if ansible_architecture == 'x86_64'},builder_containerbuild{% endif %} -{% else %} {% if 'runroot' in group_names %} ; Config for it lives in /etc/kojid/runroot.conf plugins = runroot @@ -142,6 +139,5 @@ plugins = builder_containerbuild {% else %} plugins = {% endif %} -{% endif %} {% endif %}