From e2456dd9366e908f29598024a891b7b99067b2c9 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Thu, 17 Dec 2015 19:53:02 -0500
Subject: [PATCH] Ensure services are running properly

Fix issue on Debian and finally add tests to confirm things work as
expected. Zuul-merger doesn't support reloading so lets remove it.

Change-Id: I14a8d4992d08a291fda6d9679dea7dc83379feda
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 defaults/main.yaml              | 2 ++
 handlers/main.yaml              | 4 ++--
 tasks/service.yaml              | 2 ++
 templates/etc/zuul/zuul.conf.j2 | 2 ++
 tests/test.yaml                 | 8 ++++++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/defaults/main.yaml b/defaults/main.yaml
index 821c1c6..0a2e918 100644
--- a/defaults/main.yaml
+++ b/defaults/main.yaml
@@ -39,10 +39,12 @@ zuul_config_merger_git_dir: "{{ zuul_user_home }}/git"
 zuul_config_merger_git_user_email: ""
 zuul_config_merger_git_user_name: ""
 zuul_config_merger_log_config: /etc/zuul/merger-logging.conf
+zuul_config_merger_pidfile: /var/run/zuul-merger/zuul-merger.pid
 zuul_config_merger_zuul_url: 127.0.0.1
 
 zuul_config_zuul_layout_config: "{{ zuul_file_layout_yaml_dest }}"
 zuul_config_zuul_log_config: /etc/zuul/server-logging.conf
+zuul_config_zuul_pidfile: /var/run/zuul-server/zuul-server.pid
 zuul_config_zuul_state_dir: "{{ zuul_user_home }}"
 
 zuul_file_gearman_logging_conf: etc/zuul/gearman-logging.conf
diff --git a/handlers/main.yaml b/handlers/main.yaml
index eee9f9b..db0c935 100644
--- a/handlers/main.yaml
+++ b/handlers/main.yaml
@@ -17,11 +17,11 @@
     name: zuul-merger
     state: reloaded
   sudo: yes
-  when: zuul_service_zuul_merger_state == "started"
+  when: zuul_service_zuul_merger_state == "started" and not __zuul_merger_service.changed
 
 - name: Reload zuul-server
   service:
     name: zuul-server
     state: reloaded
   sudo: yes
-  when: zuul_service_zuul_server_state == "started"
+  when: zuul_service_zuul_server_state == "started" and not __zuul_server_service.changed
diff --git a/tasks/service.yaml b/tasks/service.yaml
index 81ad57a..6225100 100644
--- a/tasks/service.yaml
+++ b/tasks/service.yaml
@@ -66,9 +66,11 @@
     enabled: "{{ zuul_service_zuul_merger_enabled }}"
     name: "{{ zuul_service_zuul_merger_name }}"
     state: "{{ zuul_service_zuul_merger_state }}"
+  register: __zuul_merger_service
 
 - name: Enable zuul-server service.
   service:
     enabled: "{{ zuul_service_zuul_server_enabled }}"
     name: "{{ zuul_service_zuul_server_name }}"
     state: "{{ zuul_service_zuul_server_state }}"
+  register: __zuul_server_service
diff --git a/templates/etc/zuul/zuul.conf.j2 b/templates/etc/zuul/zuul.conf.j2
index efb9824..a74d3db 100644
--- a/templates/etc/zuul/zuul.conf.j2
+++ b/templates/etc/zuul/zuul.conf.j2
@@ -16,6 +16,7 @@ user = {{ zuul_config_gerrit_user }}
 [zuul]
 layout_config = {{ zuul_config_zuul_layout_config }}
 log_config = {{ zuul_config_zuul_log_config }}
+pidfile = {{ zuul_config_zuul_pidfile }}
 state_dir = {{ zuul_config_zuul_state_dir }}
 
 [merger]
@@ -27,6 +28,7 @@ git_user_email = {{ zuul_config_merger_git_user_email }}
 git_user_name = {{ zuul_config_merger_git_user_name }}
 {%endif %}
 log_config = {{ zuul_config_merger_log_config }}
+pidfile = {{ zuul_config_merger_pidfile }}
 zuul_url = {{ zuul_config_merger_zuul_url }}
 
 # {{ ansible_managed }}
diff --git a/tests/test.yaml b/tests/test.yaml
index 711ea28..1f7765f 100644
--- a/tests/test.yaml
+++ b/tests/test.yaml
@@ -141,3 +141,11 @@
           - redhat_zuul_server_service_stat.stat.gr_name == 'root'
           - redhat_zuul_server_service_stat.stat.mode == '0644'
       when: ansible_os_family == 'RedHat'
+
+    - name: Ensure zuul-merger is running.
+      shell: /usr/sbin/service zuul-merger status
+      tags: skip_ansible_lint
+
+    - name: Ensure zuul-server is running.
+      shell: /usr/sbin/service zuul-server status
+      tags: skip_ansible_lint