Allow user to control service states

Change-Id: Ied277489341bfb7950f12bf6f1fa96f691178348
Signed-off-by: Paul Belanger <pabelanger@redhat.com>

defaults/main.yaml

@@ -64,3 +64,11 @@ zuul_file_zuul_merger_service_owner: root
 
 zuul_file_zuul_server_service_group: root
 zuul_file_zuul_server_service_owner: root
+
+zuul_service_zuul_merger_enabled: yes
+zuul_service_zuul_merger_name: zuul-merger
+zuul_service_zuul_merger_state: started
+
+zuul_service_zuul_server_enabled: yes
+zuul_service_zuul_server_name: zuul-server
+zuul_service_zuul_server_state: started

files/etc/init.d/zuul-merger

@@ -12,10 +12,10 @@
 # Do NOT "set -e"
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Zuul Merger"
 NAME=zuul-merger
-DAEMON=zuul-merger
+DAEMON=/usr/local/bin/zuul-merger
 PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 USER=zuul

files/etc/init.d/zuul-server

@@ -10,10 +10,10 @@
 ### END INIT INFO
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Zuul"
-NAME=zuul
-DAEMON=zuul-server
+NAME=zuul-server
+DAEMON=/usr/local/bin/zuul-server
 PIDFILE=/var/run/$NAME/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 USER=zuul

handlers/main.yaml

@@ -17,9 +17,11 @@
     name: zuul-merger
     state: reloaded
   sudo: yes
+  when: zuul_service_zuul_merger_state == "started"
 
 - name: Reload zuul-server
   service:
     name: zuul-server
     state: reloaded
   sudo: yes
+  when: zuul_service_zuul_server_state == "started"

tasks/service.yaml

@@ -63,12 +63,12 @@
 
 - name: Enable zuul-merger service.
   service:
-    enabled: yes
-    name: zuul-merger
-    state: started
+    enabled: "{{ zuul_service_zuul_merger_enabled }}"
+    name: "{{ zuul_service_zuul_merger_name }}"
+    state: "{{ zuul_service_zuul_merger_state }}"
 
 - name: Enable zuul-server service.
   service:
-    enabled: yes
-    name: zuul-server
-    state: started
+    enabled: "{{ zuul_service_zuul_server_enabled }}"
+    name: "{{ zuul_service_zuul_server_name }}"
+    state: "{{ zuul_service_zuul_server_state }}"