summaryrefslogtreecommitdiffstats
path: root/roles/releng/tasks
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2016-12-13 02:31:19 +0000
committerPatrick Uiterwijk <puiterwijk@redhat.com>2016-12-13 02:31:19 +0000
commit9ca7df69de8023eaa699d144ed478e45f646c554 (patch)
treeb7c4144cc799e08146f4ac989de49ccdf8a0264e /roles/releng/tasks
parenta15fc420526bb4acd11d14f988d333717943470c (diff)
downloadansible-9ca7df69de8023eaa699d144ed478e45f646c554.tar.gz
ansible-9ca7df69de8023eaa699d144ed478e45f646c554.tar.xz
ansible-9ca7df69de8023eaa699d144ed478e45f646c554.zip
Add koji.conf for compose
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Diffstat (limited to 'roles/releng/tasks')
-rw-r--r--roles/releng/tasks/main.yml15
1 files changed, 1 insertions, 14 deletions
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml
index f85ebd217..5024ef904 100644
--- a/roles/releng/tasks/main.yml
+++ b/roles/releng/tasks/main.yml
@@ -43,22 +43,9 @@
- name: add masher koji cert/key
copy: src="{{ private }}/files/mash/masher.pem" dest=/home/masher/.fedora.cert mode=600 owner=masher group=masher
-- name: add masher koji ca cert
- copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-server-ca.cert
-- name: add masher koji ca upload cert
- copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/home/masher/.fedora-upload-ca.cert
- name: add releng koji cert/key
copy: src="{{ private }}/files/releng_key_and_cert.pem" dest=/root/.fedora.cert mode=600 owner=root group=root
-- name: add masher koji ca cert
- copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/root/.fedora-server-ca.cert
-- name: add masher koji ca upload cert
- copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/root/.fedora-upload-ca.cert
-
-- name: add koji ca cert to central system ca-trust
- copy: src="{{ private }}/files/koji/buildercerts/fedora-ca.cert" dest=/etc/pki/ca-trust/source/anchors/fedora-server-ca.cert
-- name: update ca-trust
- command: /usr/bin/update-ca-trust
# rawhide group
- name: rawhide group
@@ -136,7 +123,7 @@
template: src=mash.conf dest=/etc/mash/mash.conf
- name: /etc/koji.conf
- template: src="{{ files }}//../roles/koji_builder/templates/koji.conf" dest=/etc/koji.conf
+ template: src=koji.conf.j2 dest=/etc/koji.conf
# mock configs
- name: put extra special mock configs in