Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Consistency: releng_stg -> releng_compose_stg

Browse source 
Signed-off-by: Nils Philippsen <nils@redhat.com>
This commit is contained in:
Nils Philippsen 2021-01-25 12:16:32 +01:00 • committed by kevin
parent ba3ed42158
commit d6cdeb7aea
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

0
inventory/group_vars/releng_stg → inventory/group_vars/releng_compose_stg
View file

2
inventory/inventory
View file

@ -17,7 +17,7 @@ compose-branched01.iad2.fedoraproject.org
compose-rawhide01.iad2.fedoraproject.org compose-rawhide01.iad2.fedoraproject.org
compose-iot01.iad2.fedoraproject.org compose-iot01.iad2.fedoraproject.org
[releng_stg] [releng_compose_stg]
compose-x86-01.stg.iad2.fedoraproject.org compose-x86-01.stg.iad2.fedoraproject.org
[retrace] [retrace]

20
playbooks/groups/releng-compose.yml
View file

@ -3,10 +3,10 @@
# NOTE: make sure there is room/space for this instance on the buildvmhost # 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 # 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 - name: Setup releng compose hosts
hosts: releng_compose:releng_stg hosts: releng_compose:releng_compose_stg
user: root user: root
gather_facts: True gather_facts: True
tags: tags:
@ -43,32 +43,32 @@
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/fedora_koji' mnt_dir: '/mnt/fedora_koji'
nfs_src_dir: "{{ koji_hub_nfs }}" nfs_src_dir: "{{ koji_hub_nfs }}"
when: "'releng_stg' not in group_names" when: "'releng_compose_stg' not in group_names"
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/ostree' 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 == 'iad2'" when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree' 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 == 'iad2'" when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/ostree' 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 == 'iad2'" when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree' 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 == 'iad2'" when: "'releng_compose_stg' not in group_names and datacenter == 'iad2'"
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/ostree' mnt_dir: '/mnt/koji/ostree'
nfs_src_dir: 'fedora_ostree_content/ostree' nfs_src_dir: 'fedora_ostree_content/ostree'
when: "'releng_stg' in group_names" when: "'releng_compose_stg' in group_names"
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree' 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' in group_names" when: "'releng_compose_stg' in group_names"
- role: nfs/client - role: nfs/client
mnt_dir: '/pub' mnt_dir: '/pub'
@ -110,7 +110,7 @@
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/fedora_koji_prod' mnt_dir: '/mnt/fedora_koji_prod'
nfs_src_dir: "{{ koji_hub_nfs }}" nfs_src_dir: "{{ koji_hub_nfs }}"
when: "'releng_stg' in group_names" when: "'releng_compose_stg' in group_names"
- fedmsg/base - fedmsg/base

2
playbooks/manual/staging-sync/koji.yml
View file

@ -132,7 +132,7 @@
service: name=kojira state=started service: name=kojira state=started
- name: remount NFS on builders, composers, bodhi and odcs - 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 user: root
vars_files: vars_files:
- /srv/web/infra/ansible/vars/global.yml - /srv/web/infra/ansible/vars/global.yml

2
roles/releng/tasks/main.yml
View file

@ -154,7 +154,7 @@
- name: make a mnt/koji link - name: make a mnt/koji link
file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji 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 # Add skopeo for OCI Image management, only in stage first for testing
- name: add pkgs for OCI Image management - name: add pkgs for OCI Image management