From 6c3cfa79f0b9b74ee28fd93ad1bb5744c4ae941f Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 5 Jun 2015 22:44:35 +0000 Subject: [PATCH] Try the kojid runroot plugin in staging. --- roles/koji_builder/files/runroot.conf | 25 +++++++++++++++++++++++++ roles/koji_builder/files/stg-kojid.conf | 4 ++++ roles/koji_builder/tasks/main.yml | 8 ++++++++ 3 files changed, 37 insertions(+) create mode 100644 roles/koji_builder/files/runroot.conf diff --git a/roles/koji_builder/files/runroot.conf b/roles/koji_builder/files/runroot.conf new file mode 100644 index 0000000000..19023bc7b6 --- /dev/null +++ b/roles/koji_builder/files/runroot.conf @@ -0,0 +1,25 @@ +[paths] +; comma-delimited list of default mountpoints +; They will be mounted during each run. It is suggested, that these +; paths have readonly options and are made writable via extra_mounts +; parameter for individual calls. +; default_mounts = /mnt/archive,/mnt/workdir + +; 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/workdir/tmp + +; path substitutions is tuple per line, delimited by comma, order is +; important. +; Path prefixes which can be substituted for other mountpoints. +; Usable for locations symlinked from other mounts. +; path_subs = /mnt/archive/prehistory/,/mnt/prehistoric_disk/archive/prehistory + +; mount origins, order is important here, ordered by best catch +; [path0] +; mountpoint = /mnt/archive +; path = archive.org:/vol/archive +; fstype = nfs +; options = ro,hard,intr,nosuid,nodev,noatime,tcp diff --git a/roles/koji_builder/files/stg-kojid.conf b/roles/koji_builder/files/stg-kojid.conf index 8ad38e58ba..dd0f6a8e0d 100644 --- a/roles/koji_builder/files/stg-kojid.conf +++ b/roles/koji_builder/files/stg-kojid.conf @@ -60,3 +60,7 @@ ca = /etc/kojid/cacert.pem ;certificate of the CA that issued the HTTP server certificate serverca = /etc/kojid/cacert.pem + +; Let's try the runroot plugin in staging. +; Config for it lives in /etc/kojid/runroot.conf +plugins = runroot diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index e07a72795e..be40908e52 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -126,6 +126,14 @@ tags: - koji_builder +- name: config for the kojid runroot plugin (only in staging) + src: runroot.conf dest=/etc/kojid/runroot.conf + when: inventory_hostname.startswith(('koji01.stg','buildvm-01.stg')) + notify: + - restart kojid + tags: + - koji_builder + - name: /etc/koji/koji.conf copy: src=koji.conf dest=/etc/koji.conf when: not inventory_hostname.startswith(('arm01','arm03','aarch64','ppc8'))