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

releng-secondary no longer exists

Browse source
This commit is contained in:
Kevin Fenzi 2018-06-19 21:55:45 +00:00
parent ba115dd4e4
commit 79dbb26d35
3 changed files with 2 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,7 +6,7 @@
- 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-stg"
- name: Setup releng compose hosts - name: Setup releng compose hosts
hosts: releng-compose:releng-secondary:releng-stg hosts: releng-compose:releng-stg
user: root user: root
gather_facts: True gather_facts: True
tags: tags:
@ -48,7 +48,6 @@
when: inventory_hostname == 'composer.stg.phx2.fedoraproject.org' 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-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-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 }}" } - { role: nfs/client, when: "'releng-stg' in group_names", mnt_dir: '/mnt/fedora_koji_prod', nfs_src_dir: "{{ koji_hub_nfs }}" }
- fedmsg/base - fedmsg/base
- role: releng - role: releng

2
playbooks/run_fasClient.yml
View file

@ -25,7 +25,7 @@
ignore_errors: true ignore_errors: true
- name: run fasClient -i on the rest of hosts which only affects sysadmins - 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 user: root
gather_facts: False gather_facts: False

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

@ -101,21 +101,6 @@
- pungi-utils - pungi-utils
when: "'releng-compose' in group_names" 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 - name: Custom compose-koji
template: src=compose-koji.j2 dest=/usr/bin/compose-koji template: src=compose-koji.j2 dest=/usr/bin/compose-koji
mode=0755 mode=0755
@ -127,14 +112,6 @@
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-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 - name: add pkgs for nightly compose
package: state=present pkg={{ item }} package: state=present pkg={{ item }}
with_items: with_items: