mirror of
https://pagure.io/fedora-infra/ansible.git
synced 2026-05-01 14:02:12 +08:00
releng-compose: reorg logic and fix staging ostree mounts
Move all the prod and stg mounts into the same areas and fix the conditional to not be negative and fix the ostree mounts to mount in the right place in staging. Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
@@ -40,41 +40,48 @@
|
||||
service: mash
|
||||
host: "koji{{env_suffix}}.fedoraproject.org"
|
||||
|
||||
# production composer nfs mounts
|
||||
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/fedora_koji'
|
||||
nfs_src_dir: "{{ koji_hub_nfs }}"
|
||||
when: "'releng_compose_stg' not in group_names"
|
||||
when: "'releng_compose' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/koji/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/ostree'
|
||||
when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
|
||||
when: "'releng_compose' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/koji/compose/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
|
||||
when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
|
||||
when: "'releng_compose' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/koji/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/ostree'
|
||||
when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
|
||||
when: "'releng_compose' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/koji/compose/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
|
||||
when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
|
||||
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/koji/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/ostree'
|
||||
when: "'releng_compose_stg' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/koji/compose/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
|
||||
when: "'releng_compose_stg' in group_names"
|
||||
|
||||
when: "'releng_compose' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/pub'
|
||||
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub'
|
||||
when: "'releng_compose' in group_names"
|
||||
|
||||
# staging composer nfs mounts
|
||||
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/fedora_koji_prod'
|
||||
nfs_src_dir: "{{ koji_hub_nfs }}"
|
||||
when: "'releng_compose_stg' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/fedora_koji_prod/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/ostree'
|
||||
when: "'releng_compose_stg' in group_names"
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/fedora_koji_prod/compose/ostree'
|
||||
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
|
||||
when: "'releng_compose_stg' in group_names"
|
||||
|
||||
- role: nfs/client
|
||||
mnt_dir: '/srv/fedora_ftp_archive'
|
||||
nfs_src_dir: 'fedora_ftp_archive'
|
||||
@@ -112,11 +119,6 @@
|
||||
nfs_src_dir: '/fedora_koji_archive05'
|
||||
when: "'releng_compose' in group_names"
|
||||
|
||||
- role: nfs/client
|
||||
mnt_dir: '/mnt/fedora_koji_prod'
|
||||
nfs_src_dir: "{{ koji_hub_nfs }}"
|
||||
when: "'releng_compose_stg' in group_names"
|
||||
|
||||
- role: rabbit/user
|
||||
username: "pungi{{ env_suffix }}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user