buildvm buildhw: move the koji NFS mounts to a variable to simplify the playbook mount logic

12 files changed, 21 insertions, 11 deletions

diff --git a/inventory/group_vars/buildaarch64 b/inventory/group_vars/buildaarch64
index d4f72393e..ef2a8781c 100644
--- a/inventory/group_vars/buildaarch64
+++ b/inventory/group_vars/buildaarch64
@@ -4,6 +4,7 @@ fas_client_groups: sysadmin-releng,sysadmin-secondary
 sudoers: "{{ private }}/files/sudo/buildsecondary-sudoers"
 gw: 10.5.78.254
 
+koji_hub_nfs: "fedora_arm/data"
 koji_server_url: "http://arm.koji.fedoraproject.org/kojihub"
 koji_weburl: "http://arm.koji.fedoraproject.org/koji"
 koji_topurl: "http://armpkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildarm b/inventory/group_vars/buildarm
index 8d36e739b..49c9c7b65 100644
--- a/inventory/group_vars/buildarm
+++ b/inventory/group_vars/buildarm
@@ -3,6 +3,7 @@ fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 ansible_ifcfg_blacklist: true
 
+koji_hub_nfs: "fedora_koji"
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
 koji_weburl: "http:/koji.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildhw b/inventory/group_vars/buildhw
index 6c2cc5e39..e8afaa4e2 100644
--- a/inventory/group_vars/buildhw
+++ b/inventory/group_vars/buildhw
@@ -4,6 +4,7 @@ fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 freezes: true
 
+koji_hub_nfs: "fedora_koji"
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
 koji_weburl: "http://koji.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildppc b/inventory/group_vars/buildppc
index ec549581f..41053edcf 100644
--- a/inventory/group_vars/buildppc
+++ b/inventory/group_vars/buildppc
@@ -24,6 +24,7 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
+koji_hub_nfs: "fedora_koji"
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
 koji_weburl: "http://koji.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildppc64 b/inventory/group_vars/buildppc64
index b969b190d..06bd9c453 100644
--- a/inventory/group_vars/buildppc64
+++ b/inventory/group_vars/buildppc64
@@ -3,6 +3,7 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng,sysadmin-secondary
 sudoers: "{{ private }}/files/sudo/buildsecondary-sudoers"
 
+koji_hub_nfs: "fedora_ppc/data"
 koji_server_url: "http://ppc.koji.fedoraproject.org/kojihub"
 koji_weburl: "http://ppc.koji.fedoraproject.org/koji"
 koji_topurl: "http://ppcpkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildppcle b/inventory/group_vars/buildppcle
index 0ea9bbe53..fb13c74dd 100644
--- a/inventory/group_vars/buildppcle
+++ b/inventory/group_vars/buildppcle
@@ -23,6 +23,7 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
+koji_hub_nfs: "fedora_koji"
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
 koji_weburl: "http://koji.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildvm b/inventory/group_vars/buildvm
index a16019f5e..bad6dfa79 100644
--- a/inventory/group_vars/buildvm
+++ b/inventory/group_vars/buildvm
@@ -18,6 +18,7 @@ host_group: kojibuilder
 fas_client_groups: sysadmin-releng
 sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
+koji_hub_nfs: "fedora_koji"
 koji_server_url: "http://koji.fedoraproject.org/kojihub"
 koji_weburl: "http://koji.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildvm-ppc64 b/inventory/group_vars/buildvm-ppc64
index cab1c24ea..23c2631d1 100644
--- a/inventory/group_vars/buildvm-ppc64
+++ b/inventory/group_vars/buildvm-ppc64
@@ -20,6 +20,7 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
 virt_install_command: "{{ virt_install_command_one_nic }} --graphics none"
 
+koji_hub_nfs: "fedora_ppc/data"
 koji_server_url: "http://ppc.koji.fedoraproject.org/kojihub"
 koji_weburl: "http://ppc.koji.fedoraproject.org/koji"
 koji_topurl: "http://ppcpkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildvm-ppc64le b/inventory/group_vars/buildvm-ppc64le
index 283d7cce4..29e93493e 100644
--- a/inventory/group_vars/buildvm-ppc64le
+++ b/inventory/group_vars/buildvm-ppc64le
@@ -20,6 +20,7 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 
 virt_install_command: "{{ virt_install_command_one_nic }} --graphics none"
 
+koji_hub_nfs: "fedora_ppc/data"
 koji_server_url: "http://ppc.koji.fedoraproject.org/kojihub"
 koji_weburl: "http://ppc.koji.fedoraproject.org/koji"
 koji_topurl: "http://ppcpkgs.fedoraproject.org/"
diff --git a/inventory/group_vars/buildvm-s390 b/inventory/group_vars/buildvm-s390
new file mode 100644
index 000000000..49b122879
--- /dev/null
+++ b/inventory/group_vars/buildvm-s390
@@ -0,0 +1,11 @@
+---
+# common items for the buildvm-s390* koji builders
+host_group: kojibuilder
+fas_client_groups: sysadmin-releng,sysadmin-secondary
+sudoers: "{{ private }}/files/sudo/00releng-sudoers"
+
+koji_hub_nfs: "fedora_s390/data"
+koji_server_url: "http://s390.koji.fedoraproject.org/kojihub"
+koji_weburl: "http://s390.koji.fedoraproject.org/koji"
+koji_topurl: "http://s390pkgs.fedoraproject.org/"
+
diff --git a/inventory/group_vars/buildvm-stg b/inventory/group_vars/buildvm-stg
index 0d2a96f9d..3decf36e6 100644
--- a/inventory/group_vars/buildvm-stg
+++ b/inventory/group_vars/buildvm-stg
@@ -18,6 +18,7 @@ sudoers: "{{ private }}/files/sudo/00releng-sudoers"
 datacenter: staging
 nfs_mount_opts: "rw,hard,bg,intr,noatime,nodev,nosuid"
 
+koji_hub_nfs: "fedora_koji"
 koji_server_url: "http://koji.stg.fedoraproject.org/kojihub"
 koji_weburl: "http://koji.stg.fedoraproject.org/koji"
 koji_topurl: "http://kojipkgs.stg.fedoraproject.org/"
diff --git a/inventory/host_vars/buildvm-s390-01.s390.fedoraproject.org b/inventory/host_vars/buildvm-s390-01.s390.fedoraproject.org
index 818b75f43..74ac60196 100644
--- a/inventory/host_vars/buildvm-s390-01.s390.fedoraproject.org
+++ b/inventory/host_vars/buildvm-s390-01.s390.fedoraproject.org
@@ -15,15 +15,4 @@ num_cpus: 4
 ks_url: http://10.5.126.23/repo/rhel/ks/buildvm-fedora-23
 ks_repo: http://10.5.126.23/pub/fedora/linux/releases/23/Server/x86_64/os/
 
-# for systems that do not match the above - specify the same parameter in
-# the host_vars/$hostname file
-host_group: kojibuilder
-fas_client_groups: sysadmin-releng,sysadmin-secondary
-sudoers: "{{ private }}/files/sudo/00releng-sudoers"
-
 virt_install_command: "{{ virt_install_command_one_nic }}"
-
-koji_server_url: "http://s390.koji.fedoraproject.org/kojihub"
-koji_weburl: "http://s390.koji.fedoraproject.org/koji"
-koji_topurl: "http://s390pkgs.fedoraproject.org/"
-