Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Collapse our different /etc/koji.conf copies into a template as well.

Browse source
This commit is contained in:
Ralph Bean 2015-06-11 18:12:12 +00:00
parent 9ea9f16504
commit 4cc1580eae
7 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

3
inventory/group_vars/buildaarch64
View file

@ -3,5 +3,6 @@ host_group: kojibuilder
fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/buildaarch64-sudoers"
koji_topurl: "http://armpkgs.fedoraproject.org/"
koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
koji_weburl: "http://arm.koji.fedoraproject.org/koji"
koji_topurl: "http://armpkgs.fedoraproject.org/"

3
inventory/group_vars/buildarm
View file

@ -2,5 +2,6 @@ host_group: kojibuilder
fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
koji_topurl: "http://armpkgs.fedoraproject.org/"
koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
koji_weburl: "http://arm.koji.fedoraproject.org/koji"
koji_topurl: "http://armpkgs.fedoraproject.org/"

3
inventory/group_vars/buildhw
View file

@ -4,5 +4,6 @@ fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
freezes: true
koji_topurl: "http://kojipkgs.fedoraproject.org/"
koji_server_url: "http://koji.fedoraproject.org/kojihub"
koji_weburl: "http://koji.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.fedoraproject.org/"

3
inventory/group_vars/buildvm
View file

@ -26,5 +26,6 @@ host_group: kojibuilder
fas_client_groups: sysadmin-releng
sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
koji_topurl: "http://kojipkgs.fedoraproject.org/"
koji_server_url: "http://koji.fedoraproject.org/kojihub"
koji_weburl: "http://koji.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.fedoraproject.org/"

3
inventory/group_vars/buildvm-stg
View file

@ -26,5 +26,6 @@ sudoers: "{{ private }}/files/sudo/arm-releng-sudoers"
datacenter: staging
nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
koji_topurl: "http://kojipkgs.stg.fedoraproject.org/"
koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"
koji_weburl: "http://koji.stg.fedoraproject.org/koji"
koji_topurl: "http://kojipkgs.stg.fedoraproject.org/"

23
roles/koji_builder/files/arm-koji.conf
View file

@ -1,23 +0,0 @@
[koji]
;configuration for koji cli tool
;url of XMLRPC server
server = http://arm.koji.fedoraproject.org/kojihub
;url of web interface
weburl = http://arm.koji.fedoraproject.org/koji
;path to the koji top directory
;topdir = /mnt/koji
;configuration for SSL athentication
;client certificate
;cert = ~/.koji/client.crt
;certificate of the CA that issued the client certificate
;ca = ~/.koji/clientca.crt
;certificate of the CA that issued the HTTP server certificate
;serverca = ~/.koji/serverca.crt

6
roles/koji_builder/files/koji.conf → roles/koji_builder/templates/koji.conf
View file

@ -3,13 +3,13 @@
;configuration for koji cli tool
;url of XMLRPC server
server = http://koji.fedoraproject.org/kojihub
server = {{ koji_server_url }}
;url of web interface
weburl = http://koji.fedoraproject.org/koji
weburl = {{ koji_weburl }}
;url of package download site
topurl = http://kojipkgs.fedoraproject.org/
topurl = {{ koji_topurl }}
;path to the koji top directory
;topdir = /mnt/koji