From 8e5b9d3ec64d09bdf0fed157e99ead55f1e536ca Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 26 May 2017 19:53:40 -0400 Subject: [PATCH] Switch to systemd module to manage services With this, we gain the ability to daemon-reload our services. Which means, if we now upload our systemd files, systemd will properly detect this and refresh the configuration. Change-Id: I3fa7bcccbb02755870b665b60280d8c483cc4a18 Signed-off-by: Paul Belanger --- defaults/main.yaml | 9 ++++++--- tasks/service.yaml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/defaults/main.yaml b/defaults/main.yaml index 4bb89ab..ffa8d07 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -98,17 +98,20 @@ zuul_file_zuul_scheduler_service_config_manage: true zuul_file_zuul_scheduler_service_config_group: root zuul_file_zuul_scheduler_service_config_owner: root +zuul_service_zuul_executor_daemon_reload: yes zuul_service_zuul_executor_enabled: yes zuul_service_zuul_executor_manage: true -zuul_service_zuul_executor_name: zuul-executor +zuul_service_zuul_executor_name: zuul-executor.service zuul_service_zuul_executor_state: started +zuul_service_zuul_merger_daemon_reload: yes zuul_service_zuul_merger_enabled: yes zuul_service_zuul_merger_manage: true -zuul_service_zuul_merger_name: zuul-merger +zuul_service_zuul_merger_name: zuul-merger.service zuul_service_zuul_merger_state: started +zuul_service_zuul_scheduler_daemon_reload: yes zuul_service_zuul_scheduler_enabled: yes zuul_service_zuul_scheduler_manage: true -zuul_service_zuul_scheduler_name: zuul-scheduler +zuul_service_zuul_scheduler_name: zuul-scheduler.service zuul_service_zuul_scheduler_state: started diff --git a/tasks/service.yaml b/tasks/service.yaml index 25917f1..7c85646 100644 --- a/tasks/service.yaml +++ b/tasks/service.yaml @@ -197,7 +197,8 @@ - name: Enable zuul-executor service. become: yes - service: + systemd: + daemon_reload: "{{ zuul_service_zuul_executor_daemon_reload }}" enabled: "{{ zuul_service_zuul_executor_enabled }}" name: "{{ zuul_service_zuul_executor_name }}" state: "{{ zuul_service_zuul_executor_state }}" @@ -206,7 +207,8 @@ - name: Enable zuul-merger service. become: yes - service: + systemd: + daemon_reload: "{{ zuul_service_zuul_merger_daemon_reload }}" enabled: "{{ zuul_service_zuul_merger_enabled }}" name: "{{ zuul_service_zuul_merger_name }}" state: "{{ zuul_service_zuul_merger_state }}" @@ -215,7 +217,8 @@ - name: Enable zuul-scheduler service. become: yes - service: + systemd: + daemon_reload: "{{ zuul_service_zuul_scheduler_daemon_reload }}" enabled: "{{ zuul_service_zuul_scheduler_enabled }}" name: "{{ zuul_service_zuul_scheduler_name }}" state: "{{ zuul_service_zuul_scheduler_state }}"