From acb6babb45ec07355c1f49ed727d2d23e0af8f50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20P=C3=A1ral?= Date: Fri, 5 Jan 2018 15:33:48 +0100 Subject: [PATCH] taskotron: add restart buildmaster handler and fix buildslave services --- handlers/restart_services.yml | 4 +++- roles/taskotron/buildslave-configure/tasks/main.yml | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/handlers/restart_services.yml b/handlers/restart_services.yml index 93e20433dd..53a3495aa5 100644 --- a/handlers/restart_services.yml +++ b/handlers/restart_services.yml @@ -20,7 +20,7 @@ - name: restart 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 - # 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. when: inventory_hostname not in ['bodhi-backend01.phx2.fedoraproject.org', 'bodhi-backend03.phx2.fedoraproject.org'] @@ -180,3 +180,5 @@ - name: restart darkserver service: name=darkserver state=restarted +- name: restart buildmaster + service: name=buildmaster state=restarted diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml b/roles/taskotron/buildslave-configure/tasks/main.yml index 4e39f21ca1..ae010f5c82 100644 --- a/roles/taskotron/buildslave-configure/tasks/main.yml +++ b/roles/taskotron/buildslave-configure/tasks/main.yml @@ -40,15 +40,15 @@ - name: generate buildslave service file template: src=buildslave.service.j2 dest=/lib/systemd/system/buildslave.service owner=root group=root mode=0744 when: deployment_type in ['local', 'qa-stg'] + register: buildslave-service notify: - reload systemd - meta: flush_handlers - 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'] - - name: create slave become: true become_user: '{{ item.user }}' @@ -119,7 +119,7 @@ - meta: flush_handlers - 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: - '{{ slaves|default([dict(user="", home="", dir="")]) }}' when: deployment_type in ['dev', 'stg', 'prod']