diff options
| author | Ralph Bean <rbean@redhat.com> | 2015-06-11 20:14:38 +0000 |
|---|---|---|
| committer | Ralph Bean <rbean@redhat.com> | 2015-06-11 20:14:46 +0000 |
| commit | 7d55947b9f1cf799fbec5b753b453db340150578 (patch) | |
| tree | 4d48f6c619fe692d91c50cd46c71d7de12a70156 | |
| parent | 7f2f3566eca7bcda0aa57acdff543010ccaa5308 (diff) | |
| download | ansible-7d55947b9f1cf799fbec5b753b453db340150578.tar.gz ansible-7d55947b9f1cf799fbec5b753b453db340150578.tar.xz ansible-7d55947b9f1cf799fbec5b753b453db340150578.zip | |
For now, install the kojid runroot plugin on a "runroot" subset of builders.
| -rw-r--r-- | inventory/builders | 8 | ||||
| -rw-r--r-- | roles/koji_builder/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/koji_hub/tasks/main.yml | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/inventory/builders b/inventory/builders index 6c1a378f4..0a227f8ec 100644 --- a/inventory/builders +++ b/inventory/builders @@ -189,6 +189,14 @@ arm04-builder21.arm.fedoraproject.org arm04-builder22.arm.fedoraproject.org arm04-builder23.arm.fedoraproject.org +# These hosts get the runroot plugin installed. +# They should be added to their own 'runroot' channel in the koji db +# .. and they should not appear in the default channel for builds. +[runroot] +buildvm-01.phx2.fedoraproject.org +buildvm-01.stg.phx2.fedoraproject.org + + [builders:children] buildhw buildvm diff --git a/roles/koji_builder/tasks/main.yml b/roles/koji_builder/tasks/main.yml index 7f3a8cd20..9a8b569b0 100644 --- a/roles/koji_builder/tasks/main.yml +++ b/roles/koji_builder/tasks/main.yml @@ -114,9 +114,9 @@ tags: - koji_builder -- name: config for the kojid runroot plugin (only in staging) +- name: config for the kojid runroot plugin (only some builders) copy: src=runroot.conf dest=/etc/kojid/runroot.conf - when: env == 'staging' + when: "'runroot' in group_names" notify: - restart kojid tags: diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 2ff47c6bd..d0c8c7fe9 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -79,14 +79,13 @@ # This was submitted to koji upstream, so we won't always need to install it # ourselves this way once it is merged and released. # https://lists.fedoraproject.org/pipermail/buildsys/2015-June/004780.html -- name: koji runroot hub plugin (only staging for now) +- name: koji runroot hub plugin copy: src=runroot_hub.py dest=/usr/lib/koji-hub-plugins/runroot_hub.py notify: - restart httpd tags: - config - koji_hub - when: env == 'staging' # # install production certs and keys |