From a9ab782340ce68e291a9ac91c540a6a30d6a4a18 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 9 Jun 2020 21:08:21 -0700 Subject: [PATCH] iad2: fedora-ostree-content is now fedora_ostree_content to better match netapp standards Signed-off-by: Kevin Fenzi --- playbooks/groups/bodhi-backend.yml | 8 ++++---- playbooks/groups/buildhw.yml | 8 ++++---- playbooks/groups/buildvm.yml | 8 ++++---- playbooks/groups/koji-hub.yml | 8 ++++---- playbooks/groups/kojipkgs.yml | 4 ++-- playbooks/groups/releng-compose.yml | 8 ++++---- playbooks/manual/autosign.yml | 8 ++++---- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index ce0a9a4c4b..e357970188 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -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) diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 0353bdad3a..90522ad154 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -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 diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 8f97304d0b..9096978aa8 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -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') } diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index f43a2298b6..7bfc47c43d 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -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' diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index 5a521722da..b8040cb9f2 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -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' diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index d42552f504..eb35a339fa 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -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 diff --git a/playbooks/manual/autosign.yml b/playbooks/manual/autosign.yml index 2be735b0fe..26a0666b57 100644 --- a/playbooks/manual/autosign.yml +++ b/playbooks/manual/autosign.yml @@ -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