From c007bb79ae5ee27467f5f8e1fc87909a4e477430 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Fri, 1 May 2020 22:21:17 +0000 Subject: [PATCH] runroot now has access to /srv/odcs Signed-off-by: Mohan Boddu --- roles/koji_builder/templates/runroot.conf.j2 | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/roles/koji_builder/templates/runroot.conf.j2 b/roles/koji_builder/templates/runroot.conf.j2 index 72efb3f377..1e553f2520 100644 --- a/roles/koji_builder/templates/runroot.conf.j2 +++ b/roles/koji_builder/templates/runroot.conf.j2 @@ -5,7 +5,7 @@ ; parameter for individual calls. ; default_mounts = /mnt/archive,/mnt/workdir {% if env == 'production' %} -default_mounts = /mnt/koji +default_mounts = /mnt/koji,/srv/odcs/ {% elif env == 'staging' %} ; In staging we also need the production split volume default_mounts = /mnt/koji,/mnt/fedora_koji_prod/koji,/etc/kojid/secrets @@ -15,7 +15,7 @@ default_mounts = /mnt/koji,/mnt/fedora_koji_prod/koji,/etc/kojid/secrets ; 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,/mnt/koji/atomic-cd +safe_roots = /mnt/koji/compose,/mnt/koji/atomic-cd,/srv/odcs/ ; path substitutions is tuple per line, delimited by comma, order is ; important. @@ -42,16 +42,22 @@ path = /mnt/koji fstype = bind options = bind +[path2] +mountpoint = /srv/odcs +path = /srv/odcs +fstype = bind +options = bind + {% if env == 'staging' %} ; we need to mount the production split volume here. -[path2] +[path3] 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] +[path4] mountpoint = /etc/kojid/secrets path = /etc/kojid/secrets fstype = bind