diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index f5754fc6f5..a535c0daf4 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -6,7 +6,7 @@ - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg" - name: Setup releng compose hosts - hosts: releng-compose:releng-secondary:releng-stg + hosts: releng-compose:releng-stg user: root gather_facts: True tags: @@ -48,7 +48,6 @@ when: inventory_hostname == 'composer.stg.phx2.fedoraproject.org' - { role: nfs/client, when: "'releng-stg' not in group_names", mnt_dir: '/mnt/fedora_koji', nfs_src_dir: "{{ koji_hub_nfs }}" } - { role: nfs/client, when: "'releng-compose' in group_names", mnt_dir: '/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub' } - - { role: nfs/client, when: "'releng-secondary' in group_names", mnt_dir: '/pub/fedora-secondary', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub/fedora-secondary' } - { role: nfs/client, when: "'releng-stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: "{{ koji_hub_nfs }}" } - fedmsg/base - role: releng diff --git a/playbooks/run_fasClient.yml b/playbooks/run_fasClient.yml index 4849ba78a6..66dd22b822 100644 --- a/playbooks/run_fasClient.yml +++ b/playbooks/run_fasClient.yml @@ -25,7 +25,7 @@ ignore_errors: true - name: run fasClient -i on the rest of hosts which only affects sysadmins - hosts: all:!builders:!*cloud*:!*composer*:!people*:!pkgs02*:!*.stg.*:!twisted*:!*.fedorainfracloud.org:!ppc-hub*:!bkernel*:!fed-cloud01*:!fed-cloud02*:!releng-secondary + hosts: all:!builders:!*cloud*:!*composer*:!people*:!pkgs02*:!*.stg.*:!twisted*:!*.fedorainfracloud.org:!bkernel*:!autosign*:!*.app.os.fedoraproject.org:!*.app.os.stg.fedoraproject.org: user: root gather_facts: False diff --git a/roles/releng/tasks/main.yml b/roles/releng/tasks/main.yml index c7da1df969..5d96d1cd16 100644 --- a/roles/releng/tasks/main.yml +++ b/roles/releng/tasks/main.yml @@ -101,21 +101,6 @@ - pungi-utils when: "'releng-compose' in group_names" -# add sigul to secondary arch compose boxes -- name: add pkgs - dnf: state=present pkg={{ item }} - with_items: - - sigul - when: ansible_distribution_major_version|int > 21 and "'releng-secondary' in group_names" - -# put secondary sigul config on secondary compose boxes -- name: secondary sigul config - copy: src="sigul-client-secondary.conf" dest=/etc/sigul/client.conf - when: "'releng-secondary' in group_names" - -- name: copy over our mash.conf - template: src=mash.conf dest=/etc/mash/mash.conf - - name: Custom compose-koji template: src=compose-koji.j2 dest=/usr/bin/compose-koji mode=0755 @@ -127,14 +112,6 @@ file: state=link src=/mnt/fedora_koji/koji dest=/mnt/koji when: "'releng-compose' in group_names or 'releng-stg' in group_names" -- name: make a mnt/koji link for AltArch - file: state=link src=/mnt/fedora_koji dest=/mnt/koji - when: "'releng-secondary' in group_names" - -- name: symlink /srv/pungi - file: src=/mnt/fedora_koji/koji/compose dest=/srv/pungi state=link - when: "'releng-secondary' not in group_names" - - name: add pkgs for nightly compose package: state=present pkg={{ item }} with_items: