diff --git a/inventory/group_vars/releng_stg b/inventory/group_vars/releng_compose_stg similarity index 100% rename from inventory/group_vars/releng_stg rename to inventory/group_vars/releng_compose_stg diff --git a/inventory/inventory b/inventory/inventory index 135b117e87..da6d31a8e2 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -17,7 +17,7 @@ compose-branched01.iad2.fedoraproject.org compose-rawhide01.iad2.fedoraproject.org compose-iot01.iad2.fedoraproject.org -[releng_stg] +[releng_compose_stg] compose-x86-01.stg.iad2.fedoraproject.org [retrace] diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index dc1677806d..4e82db5124 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -3,10 +3,10 @@ # NOTE: make sure there is room/space for this instance on the buildvmhost # NOTE: most of these vars_path come from group_vars/releng or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng_compose:releng_stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng_compose:releng_compose_stg" - name: Setup releng compose hosts - hosts: releng_compose:releng_stg + hosts: releng_compose:releng_compose_stg user: root gather_facts: True tags: @@ -43,32 +43,32 @@ - role: nfs/client mnt_dir: '/mnt/fedora_koji' nfs_src_dir: "{{ koji_hub_nfs }}" - when: "'releng_stg' not in group_names" + when: "'releng_compose_stg' not in group_names" - role: nfs/client mnt_dir: '/mnt/koji/ostree' nfs_src_dir: 'fedora_ostree_content/ostree' - when: "'releng_stg' not in group_names and datacenter == 'iad2'" + when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'" - role: nfs/client mnt_dir: '/mnt/koji/compose/ostree' nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: "'releng_stg' not in group_names and datacenter == 'iad2'" + 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_stg' not in group_names and datacenter == 'iad2'" + when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'" - role: nfs/client mnt_dir: '/mnt/koji/compose/ostree' nfs_src_dir: 'fedora_ostree_content/compose/ostree' - when: "'releng_stg' not in group_names and datacenter == 'iad2'" + 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_stg' in group_names" + 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_stg' in group_names" + when: "'releng_compose_stg' in group_names" - role: nfs/client mnt_dir: '/pub' @@ -110,7 +110,7 @@ - role: nfs/client mnt_dir: '/mnt/fedora_koji_prod' nfs_src_dir: "{{ koji_hub_nfs }}" - when: "'releng_stg' in group_names" + when: "'releng_compose_stg' in group_names" - fedmsg/base diff --git a/playbooks/manual/staging-sync/koji.yml b/playbooks/manual/staging-sync/koji.yml index 6a2d441d8a..693b37a957 100644 --- a/playbooks/manual/staging-sync/koji.yml +++ b/playbooks/manual/staging-sync/koji.yml @@ -132,7 +132,7 @@ service: name=kojira state=started - name: remount NFS on builders, composers, bodhi and odcs - hosts: builders_stg:releng_stg:bodhi_backend_stg:odcs_backend_stg:odcs_frontend_stg + hosts: builders_stg:releng_compose_stg:bodhi_backend_stg:odcs_backend_stg:odcs_frontend_stg user: root vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index ebd5f18067..48a1d05364 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -154,7 +154,7 @@ - name: make a mnt/koji link file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji - when: "'releng_compose' in group_names or 'releng_stg' in group_names" + when: "'releng_compose' in group_names or 'releng_compose_stg' in group_names" # Add skopeo for OCI Image management, only in stage first for testing - name: add pkgs for OCI Image management