releng: move compose hosts to use koji_hub_nfs variable to simplify playbook

This commit is contained in:
Peter Robinson 2016-05-12 10:26:10 +00:00
parent c2147e4b3a
commit 0e07abb2ef
9 changed files with 18 additions and 6 deletions

View file

@ -4,6 +4,8 @@ eth0_ip: 10.5.125.66
eth1_ip: 10.5.127.53 eth1_ip: 10.5.127.53
volgroup: /dev/vg_bvirthost08 volgroup: /dev/vg_bvirthost08
koji_hub_nfs: "fedora_koji"
kojipkgs_url: kojipkgs.fedoraproject.org kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.fedoraproject.org/kojihub kojihub_url: koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https

View file

@ -1,6 +1,8 @@
eth0_ip: 10.5.78.70 eth0_ip: 10.5.78.70
gw: 10.5.78.254 gw: 10.5.78.254
koji_hub_nfs: "fedora_arm/data"
kojipkgs_url: armpkgs.fedoraproject.org kojipkgs_url: armpkgs.fedoraproject.org
kojihub_url: arm.koji.fedoraproject.org/kojihub kojihub_url: arm.koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https

View file

@ -9,6 +9,8 @@ eth0_ip: 10.5.129.14
gw: 10.5.129.254 gw: 10.5.129.254
main_bridge: br1 main_bridge: br1
koji_hub_nfs: "fedora_ppc/data"
kojipkgs_url: ppcpkgs.fedoraproject.org kojipkgs_url: ppcpkgs.fedoraproject.org
kojihub_url: ppc.koji.fedoraproject.org/kojihub kojihub_url: ppc.koji.fedoraproject.org/kojihub
kojihub_scheme: http kojihub_scheme: http

View file

@ -9,6 +9,8 @@ eth0_ip: 10.5.129.15
gw: 10.5.129.254 gw: 10.5.129.254
main_bridge: br1 main_bridge: br1
koji_hub_nfs: "fedora_arm/data"
kojipkgs_url: armpkgs.fedoraproject.org kojipkgs_url: armpkgs.fedoraproject.org
kojihub_url: arm.koji.fedoraproject.org/kojihub kojihub_url: arm.koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https

View file

@ -11,6 +11,8 @@ gw: 10.5.129.254
dns: 10.5.126.21 dns: 10.5.126.21
main_bridge: br1 main_bridge: br1
koji_hub_nfs: "fedora_s390/data"
kojipkgs_url: s390pkgs.fedoraproject.org kojipkgs_url: s390pkgs.fedoraproject.org
kojihub_url: 390koji.fedoraproject.org/kojihub kojihub_url: 390koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https

View file

@ -24,6 +24,8 @@ datacenter: phx2
fas_client_groups: sysadmin-noc,sysadmin-releng fas_client_groups: sysadmin-noc,sysadmin-releng
koji_hub_nfs: "fedora_koji"
kojipkgs_url: kojipkgs.fedoraproject.org kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.fedoraproject.org/kojihub kojihub_url: koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https

View file

@ -13,6 +13,8 @@ datacenter: staging
fas_client_groups: sysadmin-releng,sysadmin-fedimg fas_client_groups: sysadmin-releng,sysadmin-fedimg
koji_hub_nfs: "fedora_koji"
kojipkgs_url: kojipkgs.fedoraproject.org kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.stg.fedoraproject.org/kojihub kojihub_url: koji.stg.fedoraproject.org/kojihub
kojihub_scheme: http kojihub_scheme: http

View file

@ -3,6 +3,8 @@ eth0_ip: 10.5.125.69
eth1_ip: 10.5.127.54 eth1_ip: 10.5.127.54
volgroup: /dev/vg_bvirthost06 volgroup: /dev/vg_bvirthost06
koji_hub_nfs: "fedora_koji"
kojipkgs_url: kojipkgs.fedoraproject.org kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.fedoraproject.org/kojihub kojihub_url: koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https

View file

@ -27,13 +27,9 @@
- collectd/base - collectd/base
- sudo - sudo
- fedmsg/base - 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: "'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: "'releng-stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: "{{ koji_hub_nfs }}" }
- { 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' }
- releng - releng
tasks: tasks: