diff --git a/inventory/host_vars/branched-composer.phx2.fedoraproject.org b/inventory/host_vars/branched-composer.phx2.fedoraproject.org index a5d351468d..2eca3c1c34 100644 --- a/inventory/host_vars/branched-composer.phx2.fedoraproject.org +++ b/inventory/host_vars/branched-composer.phx2.fedoraproject.org @@ -4,6 +4,8 @@ eth0_ip: 10.5.125.66 eth1_ip: 10.5.127.53 volgroup: /dev/vg_bvirthost08 +koji_hub_nfs: "fedora_koji" + kojipkgs_url: kojipkgs.fedoraproject.org kojihub_url: koji.fedoraproject.org/kojihub kojihub_scheme: https diff --git a/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org b/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org index 55454cf5a8..f7a501f4f4 100644 --- a/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org +++ b/inventory/host_vars/compose-aarch64-01.arm.fedoraproject.org @@ -1,6 +1,8 @@ eth0_ip: 10.5.78.70 gw: 10.5.78.254 +koji_hub_nfs: "fedora_arm/data" + kojipkgs_url: armpkgs.fedoraproject.org kojihub_url: arm.koji.fedoraproject.org/kojihub kojihub_scheme: https diff --git a/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org b/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org index 4b37749537..3093665c61 100644 --- a/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org +++ b/inventory/host_vars/compose-ppc64-01.ppc.fedoraproject.org @@ -9,6 +9,8 @@ eth0_ip: 10.5.129.14 gw: 10.5.129.254 main_bridge: br1 +koji_hub_nfs: "fedora_ppc/data" + kojipkgs_url: ppcpkgs.fedoraproject.org kojihub_url: ppc.koji.fedoraproject.org/kojihub kojihub_scheme: http diff --git a/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org b/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org index 7cce800649..35639a326a 100644 --- a/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org +++ b/inventory/host_vars/compose-ppc64le-01.ppc.fedoraproject.org @@ -9,6 +9,8 @@ eth0_ip: 10.5.129.15 gw: 10.5.129.254 main_bridge: br1 +koji_hub_nfs: "fedora_arm/data" + kojipkgs_url: armpkgs.fedoraproject.org kojihub_url: arm.koji.fedoraproject.org/kojihub kojihub_scheme: https diff --git a/inventory/host_vars/compose-s390-01.s390.fedoraproject.org b/inventory/host_vars/compose-s390-01.s390.fedoraproject.org index 7d9246a891..60bc410d11 100644 --- a/inventory/host_vars/compose-s390-01.s390.fedoraproject.org +++ b/inventory/host_vars/compose-s390-01.s390.fedoraproject.org @@ -11,6 +11,8 @@ gw: 10.5.129.254 dns: 10.5.126.21 main_bridge: br1 +koji_hub_nfs: "fedora_s390/data" + kojipkgs_url: s390pkgs.fedoraproject.org kojihub_url: 390koji.fedoraproject.org/kojihub kojihub_scheme: https diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org index 761c546701..c077e428c6 100644 --- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org +++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org @@ -24,6 +24,8 @@ datacenter: phx2 fas_client_groups: sysadmin-noc,sysadmin-releng +koji_hub_nfs: "fedora_koji" + kojipkgs_url: kojipkgs.fedoraproject.org kojihub_url: koji.fedoraproject.org/kojihub kojihub_scheme: https diff --git a/inventory/host_vars/composer.stg.phx2.fedoraproject.org b/inventory/host_vars/composer.stg.phx2.fedoraproject.org index e61691c2fe..7752991e0d 100644 --- a/inventory/host_vars/composer.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/composer.stg.phx2.fedoraproject.org @@ -13,6 +13,8 @@ datacenter: staging fas_client_groups: sysadmin-releng,sysadmin-fedimg +koji_hub_nfs: "fedora_koji" + kojipkgs_url: kojipkgs.fedoraproject.org kojihub_url: koji.stg.fedoraproject.org/kojihub kojihub_scheme: http diff --git a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org index 9cb3409b4d..4fdf2231f5 100644 --- a/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org +++ b/inventory/host_vars/rawhide-composer.phx2.fedoraproject.org @@ -3,6 +3,8 @@ eth0_ip: 10.5.125.69 eth1_ip: 10.5.127.54 volgroup: /dev/vg_bvirthost06 +koji_hub_nfs: "fedora_koji" + kojipkgs_url: kojipkgs.fedoraproject.org kojihub_url: koji.fedoraproject.org/kojihub kojihub_scheme: https diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index 2cf50226cc..6f6c229c97 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -27,13 +27,9 @@ - collectd/base - sudo - fedmsg/base - - { role: nfs/client, when: "'releng-compose' in group_names", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_koji' } + - { role: nfs/client, when: "'releng-stg' not in group_names", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: "{{ koji_hub_nfs }}" } - { role: nfs/client, when: "'releng-compose' in group_names", mnt_dir: '/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - - { role: nfs/client, when: inventory_hostname.startswith('compose-aarch64-01') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_arm/data' } - - { role: nfs/client, when: inventory_hostname.startswith('compose-ppc64le-01') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_arm/data' } - - { role: nfs/client, when: inventory_hostname.startswith('compose-ppc64-01') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_ppc/data' } - - { role: nfs/client, when: inventory_hostname.startswith('compose-s390-01') , mnt_dir: '/mnt/fedora_koji', nfs_src_dir: 'fedora_s390/data' } - - { role: nfs/client, when: "'releng-stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: 'fedora_koji' } + - { role: nfs/client, when: "'releng-stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: "{{ koji_hub_nfs }}" } - releng tasks: