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

taskotron: add restart buildmaster handler and fix buildslave services

Browse source
This commit is contained in:
Kamil Páral 2018-01-05 15:33:48 +01:00
parent 54168ace6b
commit acb6babb45
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
handlers/restart_services.yml
View file

@ -20,7 +20,7 @@
- name: restart fedmsg-hub - name: restart fedmsg-hub
command: /usr/local/bin/conditional-restart.sh fedmsg-hub fedmsg-hub command: /usr/local/bin/conditional-restart.sh fedmsg-hub fedmsg-hub
# Note that, we're cool with arbitrary restarts on bodhi-backend02, just # Note that, we're cool with arbitrary restarts on bodhi-backend02, just
# not bodhi-backend01 or bodhi-backend03. 01 and 03 is where the releng/mash # not bodhi-backend01 or bodhi-backend03. 01 and 03 is where the releng/mash
# stuff happens and we # don't want to interrupt that. # stuff happens and we # don't want to interrupt that.
when: inventory_hostname not in ['bodhi-backend01.phx2.fedoraproject.org', 'bodhi-backend03.phx2.fedoraproject.org'] when: inventory_hostname not in ['bodhi-backend01.phx2.fedoraproject.org', 'bodhi-backend03.phx2.fedoraproject.org']
@ -180,3 +180,5 @@
- name: restart darkserver - name: restart darkserver
service: name=darkserver state=restarted service: name=darkserver state=restarted
- name: restart buildmaster
service: name=buildmaster state=restarted

6
roles/taskotron/buildslave-configure/tasks/main.yml
View file

@ -40,15 +40,15 @@
- name: generate buildslave service file - name: generate buildslave service file
template: src=buildslave.service.j2 dest=/lib/systemd/system/buildslave.service owner=root group=root mode=0744 template: src=buildslave.service.j2 dest=/lib/systemd/system/buildslave.service owner=root group=root mode=0744
when: deployment_type in ['local', 'qa-stg'] when: deployment_type in ['local', 'qa-stg']
register: buildslave-service
notify: notify:
- reload systemd - reload systemd
- meta: flush_handlers - meta: flush_handlers
- name: start and enable buildslave service - name: start and enable buildslave service
service: name=buildslave enabled=yes state=started service: name=buildslave enabled=yes state={{ (buildslave-service.changed) | ternary('restarted','started') }}
when: deployment_type in ['local', 'qa-stg'] when: deployment_type in ['local', 'qa-stg']
- name: create slave - name: create slave
become: true become: true
become_user: '{{ item.user }}' become_user: '{{ item.user }}'
@ -119,7 +119,7 @@
- meta: flush_handlers - meta: flush_handlers
- name: start and enable buildslave services - name: start and enable buildslave services
service: name=buildslave@{{ item.user }} enabled=yes state=started service: name=buildslave@{{ item.user }} enabled=yes state={{ (buildslave-service.changed) | ternary('restarted','started') }}
with_items: with_items:
- '{{ slaves|default([dict(user="", home="", dir="")]) }}' - '{{ slaves|default([dict(user="", home="", dir="")]) }}'
when: deployment_type in ['dev', 'stg', 'prod'] when: deployment_type in ['dev', 'stg', 'prod']