Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

runroot now has access to /srv/odcs

Browse source 
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
Mohan Boddu 2020-05-01 22:21:17 +00:00
parent d0649e64da
commit c007bb79ae
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
roles/koji_builder/templates/runroot.conf.j2
View file

@ -5,7 +5,7 @@
; parameter for individual calls. ; parameter for individual calls.
; default_mounts = /mnt/archive,/mnt/workdir ; default_mounts = /mnt/archive,/mnt/workdir
{% if env == 'production' %} {% if env == 'production' %}
default_mounts = /mnt/koji default_mounts = /mnt/koji,/srv/odcs/
{% elif env == 'staging' %} {% elif env == 'staging' %}
; In staging we also need the production split volume ; In staging we also need the production split volume
default_mounts = /mnt/koji,/mnt/fedora_koji_prod/koji,/etc/kojid/secrets 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 ; 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 ; not allowed for mounting. Only absolute paths are allowed here, no
; wildcards. ; 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 ; path substitutions is tuple per line, delimited by comma, order is
; important. ; important.
@ -42,16 +42,22 @@ path = /mnt/koji
fstype = bind fstype = bind
options = bind options = bind
[path2]
mountpoint = /srv/odcs
path = /srv/odcs
fstype = bind
options = bind
{% if env == 'staging' %} {% if env == 'staging' %}
; we need to mount the production split volume here. ; we need to mount the production split volume here.
[path2] [path3]
mountpoint = /mnt/fedora_koji_prod/koji mountpoint = /mnt/fedora_koji_prod/koji
path = /mnt/fedora_koji_prod/koji path = /mnt/fedora_koji_prod/koji
fstype = bind fstype = bind
options = ro,bind options = ro,bind
; Directory for secrets to be used by certain builds ; Directory for secrets to be used by certain builds
[path3] [path4]
mountpoint = /etc/kojid/secrets mountpoint = /etc/kojid/secrets
path = /etc/kojid/secrets path = /etc/kojid/secrets
fstype = bind fstype = bind