iad2: fedora-ostree-content is now fedora_ostree_content to better match netapp standards

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2020-06-09 21:08:21 -07:00
parent d9839a8286
commit a9ab782340
7 changed files with 26 additions and 26 deletions

View file

@ -40,12 +40,12 @@
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
when: env != 'staging' and datacenter == 'phx2'
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: env != 'staging' and datacenter == 'phx2'
- role: nfs/client
@ -60,12 +60,12 @@
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/ostree'
nfs_src_dir: 'fedora_ostree_content-stg/ostree'
when: env == 'staging'
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
nfs_src_dir: 'fedora_ostree_content_stg/compose/ostree'
when: env == 'staging'
# In staging, we mount fedora_koji as read only (see nfs_mount_opts)

View file

@ -19,12 +19,12 @@
- { role: nfs/client, mnt_dir: '/mnt/fedora_koji', nfs_src_dir: "{{ koji_hub_nfs }}", when: koji_hub_nfs is defined }
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
when: env != 'staging' and 'runroot' in group_names
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: env != 'staging' and 'runroot' in group_names
- role: nfs/client
@ -39,7 +39,7 @@
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/ostree'
nfs_src_dir: 'fedora_ostree_content_stg/ostree'
when: env == 'staging' and 'runroot' in group_names
- role: nfs/client
@ -54,7 +54,7 @@
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
nfs_src_dir: 'fedora_ostree_content_stg/compose/ostree'
when: env == 'staging' and 'runroot' in group_names
- koji_builder

View file

@ -30,17 +30,17 @@
}
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content/ostree'
nfs_src_dir: 'fedora.ostree.content/ostree'
when: env != 'staging' and 'runroot' in group_names and not inventory_hostname.startswith('buildvm-s390x')
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content/compose/ostree'
nfs_src_dir: 'fedora.ostree_content/compose/ostree'
when: env != 'staging' and 'runroot' in group_names and not inventory_hostname.startswith('buildvm-s390x')
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/ostree'
nfs_src_dir: 'fedora_ostree_content_stg/ostree'
when: env == 'staging' and 'runroot' in group_names and not inventory_hostname.startswith('buildvm-s390x')
- role: nfs/client
@ -55,7 +55,7 @@
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
nfs_src_dir: 'fedora_ostree_content_stg/compose/ostree'
when: env == 'staging' and 'runroot' in group_names and not inventory_hostname.startswith('buildvm-s390x')
- { role: fas_client, when: not inventory_hostname.startswith('bkernel') }

View file

@ -91,13 +91,13 @@
when: env == 'staging' and inventory_hostname.startswith('koji')
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
mount_stg: true
when: env != 'staging' and datacenter == 'phx2'
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
mount_stg: true
nfs_src_dir: 'fedora-ostree-content/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: env != 'staging' and datacenter == 'phx2'
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
@ -111,13 +111,13 @@
when: env != 'staging' and datacenter == 'iad2'
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
mount_stg: true
when: env == 'staging'
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
mount_stg: true
nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: env == 'staging'
- role: nfs/client
mnt_dir: '/srv/odcs'

View file

@ -51,13 +51,13 @@
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub'
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
mount_stg: true
when: datacenter == 'phx2'
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
mount_stg: true
nfs_src_dir: 'fedora-ostree-content/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: datacenter == 'phx2'
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'

View file

@ -52,11 +52,11 @@
when: "'releng_stg' not in group_names"
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
when: "'releng_stg' not in group_names and datacenter == 'phx2'"
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: "'releng_stg' not in group_names and datacenter == 'phx2'"
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
@ -69,11 +69,11 @@
- role: nfs/client
mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
when: "'releng_stg' in group_names"
- role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: "'releng_stg' in group_names"
- role: nfs/client

View file

@ -31,12 +31,12 @@
when: env != 'staging'
- role: nfs/client
mnt_dir: '/mnt/fedora_koji/koji/ostree'
nfs_src_dir: 'fedora-ostree-content/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree'
when: env != 'staging' and datacenter == 'phx2'
- role: nfs/client
mnt_dir: '/mnt/fedora_koji/koji/compose/ostree'
nfs_src_dir: 'fedora-ostree-content/compose/ostree'
nfs_src_dir: 'fedora_ostree_content/compose/ostree'
when: env != 'staging' and datacenter == 'phx2'
- role: nfs/client
@ -51,12 +51,12 @@
# - role: nfs/client
# mnt_dir: '/mnt/fedora_koji/koji/ostree'
# nfs_src_dir: 'fedora-ostree-content-stg/ostree'
# nfs_src_dir: 'fedora_ostree_content/ostree'
# when: env == 'staging'
#
# - role: nfs/client
# mnt_dir: '/mnt/fedora_koji/koji/compose/ostree'
# nfs_src_dir: 'fedora-ostree-content-stg/compose/ostree'
# nfs_src_dir: 'fedora_ostree_content/compose/ostree'
# when: env == 'staging'
- role: rabbit/queue