diff options
| author | Patrick Uiterwijk <puiterwijk@redhat.com> | 2016-12-14 13:07:12 +0000 |
|---|---|---|
| committer | Patrick Uiterwijk <puiterwijk@redhat.com> | 2016-12-14 13:07:23 +0000 |
| commit | 68a0cfe8034b28db4f391aa0e85487afafc65114 (patch) | |
| tree | df8355d308e2e4ba77cdb8fb13b2801c391e70df /roles/releng | |
| parent | 1db5d40fd80250dfccb43f996b1146489314d313 (diff) | |
| download | ansible-68a0cfe8034b28db4f391aa0e85487afafc65114.tar.gz ansible-68a0cfe8034b28db4f391aa0e85487afafc65114.tar.xz ansible-68a0cfe8034b28db4f391aa0e85487afafc65114.zip | |
Create compose koji profile
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
Diffstat (limited to 'roles/releng')
| -rw-r--r-- | roles/releng/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/releng/templates/compose-koji.j2 | 2 | ||||
| -rw-r--r-- | roles/releng/templates/koji.conf.j2 | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index 5024ef904..c886ff60f 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -122,8 +122,12 @@ - name: copy over our mash.conf template: src=mash.conf dest=/etc/mash/mash.conf +- name: Custom compose-koji + template: src=compose-koji.j2 dest=/usr/bin/compose-koji + mode=0755 + - name: /etc/koji.conf - template: src=koji.conf.j2 dest=/etc/koji.conf + template: src=koji.conf.j2 dest=/etc/koji.conf.d/compose.conf # mock configs - name: put extra special mock configs in diff --git a/roles/releng/templates/compose-koji.j2 b/roles/releng/templates/compose-koji.j2 new file mode 100644 index 000000000..a272e04bf --- /dev/null +++ b/roles/releng/templates/compose-koji.j2 @@ -0,0 +1,2 @@ +#! /bin/sh +koji --principal="compose/koji{{env_suffix}}.fedoraproject.org" --keytab="/etc/krb5.compose_koji{{env_suffix}}.fedoraproject.org.keytab" "$@" diff --git a/roles/releng/templates/koji.conf.j2 b/roles/releng/templates/koji.conf.j2 index 82ffad4c7..d333b1116 100644 --- a/roles/releng/templates/koji.conf.j2 +++ b/roles/releng/templates/koji.conf.j2 @@ -1,4 +1,4 @@ -[koji] +[compose] server = https://koji.fedoraproject.org/kojihub weburl = https://koji.fedoraproject.org/koji topurl = https://kojipkgs.fedoraproject.org/ |