From 0a1c5e8c87730e9c7631ad00c6630dfcd0f67670 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 4 Apr 2018 16:36:56 -0400
Subject: [PATCH] Use commandsocket to stop zuul services

Currently all but zuul-web support the commandsocket, so use that over
kill which systemd does by default.

Change-Id: Ic4eacbf6c74c8b722189780b1845ece0ff485b99
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 files/etc/systemd/system/zuul-executor.service  | 1 +
 files/etc/systemd/system/zuul-fingergw.service  | 1 +
 files/etc/systemd/system/zuul-merger.service    | 1 +
 files/etc/systemd/system/zuul-scheduler.service | 1 +
 4 files changed, 4 insertions(+)

diff --git a/files/etc/systemd/system/zuul-executor.service b/files/etc/systemd/system/zuul-executor.service
index 863aef1..c2e0a14 100644
--- a/files/etc/systemd/system/zuul-executor.service
+++ b/files/etc/systemd/system/zuul-executor.service
@@ -8,6 +8,7 @@ Environment="PREFIX=/usr/local"
 Group=zuul
 User=zuul
 ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-executor -d"
+ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-executor stop"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/zuul-fingergw.service b/files/etc/systemd/system/zuul-fingergw.service
index 989e440..1853d97 100644
--- a/files/etc/systemd/system/zuul-fingergw.service
+++ b/files/etc/systemd/system/zuul-fingergw.service
@@ -8,6 +8,7 @@ Environment="PREFIX=/usr/local"
 Group=root
 User=root
 ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-fingergw -d"
+ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-fingergw stop"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/zuul-merger.service b/files/etc/systemd/system/zuul-merger.service
index ea8f8af..940033b 100644
--- a/files/etc/systemd/system/zuul-merger.service
+++ b/files/etc/systemd/system/zuul-merger.service
@@ -8,6 +8,7 @@ Environment="PREFIX=/usr/local"
 Group=zuul
 User=zuul
 ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-merger -d"
+ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-merger stop"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/files/etc/systemd/system/zuul-scheduler.service b/files/etc/systemd/system/zuul-scheduler.service
index 2900cfc..96bf6b9 100644
--- a/files/etc/systemd/system/zuul-scheduler.service
+++ b/files/etc/systemd/system/zuul-scheduler.service
@@ -8,6 +8,7 @@ Environment="PREFIX=/usr/local"
 Group=zuul
 User=zuul
 ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-scheduler -d"
+ExecStop=/bin/sh -c "${PREFIX}/bin/zuul-scheduler stop"
 ExecReload=/bin/kill -HUP $MAINPID
 
 [Install]