Move koji runroot config to a template and add some changes just for staging. Prod is untouched.
Ticket 5253
This commit is contained in:
parent
a84d334ef9
commit
714636b6ed
2 changed files with 14 additions and 1 deletions
|
@ -131,7 +131,7 @@
|
||||||
- koji_builder
|
- koji_builder
|
||||||
|
|
||||||
- name: config for the kojid runroot plugin (only some builders)
|
- name: config for the kojid runroot plugin (only some builders)
|
||||||
copy: src=runroot.conf dest=/etc/kojid/runroot.conf
|
template: src=runroot.conf.j2 dest=/etc/kojid/runroot.conf
|
||||||
when: "'runroot' in group_names"
|
when: "'runroot' in group_names"
|
||||||
notify:
|
notify:
|
||||||
- restart kojid
|
- restart kojid
|
||||||
|
|
|
@ -4,7 +4,12 @@
|
||||||
; paths have readonly options and are made writable via extra_mounts
|
; paths have readonly options and are made writable via extra_mounts
|
||||||
; parameter for individual calls.
|
; parameter for individual calls.
|
||||||
; default_mounts = /mnt/archive,/mnt/workdir
|
; default_mounts = /mnt/archive,/mnt/workdir
|
||||||
|
{% if {{ env }} == 'production' %}
|
||||||
default_mounts = /mnt/koji
|
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
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
; comma-delimited list of safe roots.
|
; comma-delimited list of safe roots.
|
||||||
; 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
|
||||||
|
@ -37,3 +42,11 @@ path = /mnt/koji
|
||||||
fstype = bind
|
fstype = bind
|
||||||
options = bind
|
options = bind
|
||||||
|
|
||||||
|
{% if {{ env }} == 'staging' %}
|
||||||
|
; we need to mount the production split volume here.
|
||||||
|
[path2]
|
||||||
|
mountpoint = /mnt/fedora_koji_prod/koji
|
||||||
|
path = /mnt/fedora_koji_prod/koji
|
||||||
|
fstype = bind
|
||||||
|
options = ro,bind
|
||||||
|
{% endif %}
|
Loading…
Add table
Add a link
Reference in a new issue