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

kojibuilder / runroot: revert fuse attempts

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2023-07-21 09:42:33 -07:00
parent f94a4d1a8f
commit 8735931424
1 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
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,/dev/fuse default_mounts = /mnt/koji
{% 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,/srv/odcs/,/dev/fuse 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.
@ -48,12 +48,6 @@ path = /srv/odcs
fstype = bind fstype = bind
options = bind options = bind
[path5]
mountpoint = /dev/fuse
path = /dev/fuse
fstype = bind
options = none
{% if env == 'staging' %} {% if env == 'staging' %}
; we need to mount the production split volume here. ; we need to mount the production split volume here.
[path3] [path3]