commit 5ec684830826bf72580e5ecacb7e9cb42556faa4 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue Feb 6 14:12:05 2018 +0100 Update koji_builder roles/koji_builder/templates/kojid.conf | 4 ++-- roles/koji_builder/templates/runroot.conf.j2 | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) --- diff --git a/roles/koji_builder/templates/kojid.conf b/roles/koji_builder/templates/kojid.conf index 9180b43..36b543d 100644 --- a/roles/koji_builder/templates/kojid.conf +++ b/roles/koji_builder/templates/kojid.conf @@ -85,7 +85,7 @@ serverca = /etc/kojid/cacert.pem {% if 'runroot' in group_names %} ; Config for it lives in /etc/kojid/runroot.conf -{% if env == 'staging' %} +{% if ansible_architecture == 'x86_64' %} plugins = runroot builder_containerbuild {% else %} plugins = runroot @@ -93,7 +93,7 @@ plugins = runroot {% else %} -{% if env == 'staging' and not inventory_hostname.startswith('arm') %} +{% if ansible_architecture == 'x86_64' %} plugins = builder_containerbuild {% else %} plugins = diff --git a/roles/koji_builder/templates/runroot.conf.j2 b/roles/koji_builder/templates/runroot.conf.j2 index e91e7ef..0dc800d 100644 --- a/roles/koji_builder/templates/runroot.conf.j2 +++ b/roles/koji_builder/templates/runroot.conf.j2 @@ -8,14 +8,14 @@ default_mounts = /mnt/koji {% elif env == 'staging' %} ; In staging we also need the production split volume -default_mounts = /mnt/koji,/mnt/fedora_koji_prod/koji +default_mounts = /mnt/koji,/mnt/rpmfusion_koji/koji,/etc/kojid/secrets {% endif %} ; comma-delimited list of safe roots. ; Each extra_mount needs to start with some of these prefixes. Other paths are ; not allowed for mounting. Only absolute paths are allowed here, no ; wildcards. -safe_roots = /mnt/koji/compose +safe_roots = /mnt/koji/compose,/mnt/koji/atomic-cd ; path substitutions is tuple per line, delimited by comma, order is ; important. @@ -49,4 +49,11 @@ mountpoint = /mnt/fedora_koji_prod/koji path = /mnt/fedora_koji_prod/koji fstype = bind options = ro,bind + +; Directory for secrets to be used by certain builds +[path3] +mountpoint = /etc/kojid/secrets +path = /etc/kojid/secrets +fstype = bind +options = ro,bind {% endif %}