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

bodhi-backend: drop some more iad2 conditionals

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2025-07-03 06:46:19 -07:00
parent 1244b24408
commit 1ddf40d2dc
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
playbooks/groups/bodhi-backend.yml
View file

@ -50,52 +50,48 @@
- 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: env != 'staging' and datacenter == 'iad2' when: env != 'staging'
- 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: env != 'staging' and datacenter == 'iad2' when: env != 'staging'
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/ostree' 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 datacenter == 'iad2' when: env == 'staging'
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/koji/compose/ostree' 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 datacenter == 'iad2' when: env == 'staging'
# In staging, we mount fedora_koji as read only (see nfs_mount_opts) # In staging, we mount fedora_koji as read only (see nfs_mount_opts)
- role: nfs/client - role: nfs/client
mnt_dir: '/mnt/fedora_koji_prod' mnt_dir: '/mnt/fedora_koji_prod'
nfs_src_dir: 'fedora_koji' nfs_src_dir: 'fedora_koji'
when: env == 'staging' and datacenter == 'iad2' when: env == 'staging'
- role: nfs/client - role: nfs/client
mnt_dir: '/pub/' mnt_dir: '/pub/'
nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/' nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/'
when: datacenter == 'iad2'
- role: nfs/client - role: nfs/client
mnt_dir: '/pub/archive' mnt_dir: '/pub/archive'
nfs_src_dir: 'fedora_ftp_archive' nfs_src_dir: 'fedora_ftp_archive'
when: datacenter == 'iad2'
- role: keytab/service - role: keytab/service
owner_user: apache owner_user: apache
owner_group: apache owner_group: apache
service: bodhi service: bodhi
host: "bodhi{{ env_suffix }}.fedoraproject.org" host: "bodhi{{ env_suffix }}.fedoraproject.org"
when: datacenter == 'iad2'
- role: push-container-registry - role: push-container-registry
cert_dest_dir: "/etc/docker/certs.d/registry{{ env_suffix }}.fedoraproject.org" cert_dest_dir: "/etc/docker/certs.d/registry{{ env_suffix }}.fedoraproject.org"
cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt" cert_src: "{{private}}/files/docker-registry/{{env}}/pki/issued/containerstable.crt"
key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key" key_src: "{{private}}/files/docker-registry/{{env}}/pki/private/containerstable.key"
certs_group: apache certs_group: apache
when: datacenter == 'iad2'
- role: rabbit/queue - role: rabbit/queue
queue_username: "bodhi{{ env_suffix }}" queue_username: "bodhi{{ env_suffix }}"
@ -105,7 +101,6 @@
warning: 10 warning: 10
critical: 100 critical: 100
user_sent_topics: "{{ bodhi_sent_topics }}" user_sent_topics: "{{ bodhi_sent_topics }}"
when: datacenter == 'iad2'
- role: rabbit/queue - role: rabbit/queue
queue_username: "bodhi{{ env_suffix }}" queue_username: "bodhi{{ env_suffix }}"
@ -117,17 +112,16 @@
critical: 100 critical: 100
# We have to repeat this line for now (only the last one counts) # We have to repeat this line for now (only the last one counts)
user_sent_topics: "{{ bodhi_sent_topics }}" user_sent_topics: "{{ bodhi_sent_topics }}"
when: datacenter == 'iad2'
tasks: tasks:
- name: Create secondary volume dir for stg bodhi - name: Create secondary volume dir for stg bodhi
ansible.builtin.file: dest=/mnt/koji/vol state=directory owner=apache group=apache mode=0755 ansible.builtin.file: dest=/mnt/koji/vol state=directory owner=apache group=apache mode=0755
tags: bodhi tags: bodhi
when: env == 'staging' and datacenter == 'iad2' when: env == 'staging'
- name: Create symlink for stg/prod secondary volume - name: Create symlink for stg/prod secondary volume
ansible.builtin.file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link ansible.builtin.file: src=/mnt/fedora_koji_prod/koji dest=/mnt/koji/vol/prod state=link
tags: bodhi tags: bodhi
when: env == 'staging' and datacenter == 'iad2' when: env == 'staging'
handlers: handlers:
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"