Use group_vars and roll arm kojid into that same template.

inventory/group_vars/buildaarch64

@@ -2,3 +2,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"

inventory/group_vars/buildarm

@@ -1,3 +1,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"

inventory/group_vars/buildhw

@@ -3,3 +3,6 @@ host_group: kojibuilder
 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"

inventory/group_vars/buildvm

@@ -25,3 +25,6 @@ virt_install_command: virt-install -n {{ inventory_hostname }} -r {{ mem_size }}
 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"

inventory/group_vars/buildvm-stg

@@ -25,3 +25,6 @@ fas_client_groups: sysadmin-releng
 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"

roles/koji_builder/tasks/main.yml

@@ -102,17 +102,8 @@
   tags:
   - koji_builder
 
-- name: /etc/kojid/kojid.conf
+- name: build /etc/kojid/kojid.conf from group vars
   template: src=kojid.conf dest=/etc/kojid/kojid.conf
-  when: not inventory_hostname.startswith(('arm01','arm03','aarch64','ppc8'))
-  notify:
-  - restart kojid
-  tags:
-  - koji_builder
-
-- name: arm /etc/kojid/kojid.conf
-  copy: src=arm-kojid.conf dest=/etc/kojid/kojid.conf
-  when: inventory_hostname.startswith(('arm01','arm03','aarch64'))
   notify:
   - restart kojid
   tags:
@@ -120,7 +111,7 @@
 
 - name: config for the kojid runroot plugin (only in staging)
   copy: src=runroot.conf dest=/etc/kojid/runroot.conf
-  when: inventory_hostname.startswith(('koji01.stg','buildvm-01.stg'))
+  when: 'staging' in group_names
   notify:
   - restart kojid
   tags:

roles/koji_builder/templates/kojid.conf

@@ -11,13 +11,8 @@
 ; The directory root where work data can be found from the koji hub
 ; topdir=/mnt/koji
 
-{% if env == 'staging' %}
 ;url of package download site
-topurl = http://kojipkgs.fedoraproject.org/
-{% else %}
-;url of package download site
-topurl = http://kojipkgs.stg.fedoraproject.org/
-{% endif %}
+topurl = {{koji_topurl}}
 
 ; The directory root for temporary storage
 ; workdir=/tmp/koji
@@ -40,13 +35,8 @@ distribution=Fedora Project
 ; The _host string to use in mock
 mockhost=redhat-linux-gnu
 
-{% if env == 'staging' %}
 ; The URL for the xmlrpc server
-server=http://koji.stg.fedoraproject.org/kojihub
-{% else %}
-; The URL for the xmlrpc server
-server=http://koji.fedoraproject.org/kojihub
-{% endif %}
+server={{koji_server_url}}
 
 {% if env == 'staging' %}
 ; The URL for the packages tree