From 6ccb5af56e0938275bdc1ec256e8fbad9a91baf7 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 4 Apr 2018 15:55:59 -0400 Subject: [PATCH] Only zuul-scheduler support reloading Currently all the other services in zuul do not support it, so we can remove this logic as it is not needed. Change-Id: I013c4331070491197a119ff2b2317efa2bce4bc4 Signed-off-by: Paul Belanger --- files/etc/systemd/system/zuul-web.service | 1 - handlers/main.yaml | 36 ----------------------- tasks/config.yaml | 8 ----- 3 files changed, 45 deletions(-) diff --git a/files/etc/systemd/system/zuul-web.service b/files/etc/systemd/system/zuul-web.service index c88598a..af565f1 100644 --- a/files/etc/systemd/system/zuul-web.service +++ b/files/etc/systemd/system/zuul-web.service @@ -8,7 +8,6 @@ Environment="PREFIX=/usr/local" Group=zuul User=zuul ExecStart=/bin/sh -c "${PREFIX}/bin/zuul-web -d" -ExecReload=/bin/kill -HUP $MAINPID [Install] WantedBy=multi-user.target diff --git a/handlers/main.yaml b/handlers/main.yaml index b9e216c..fd34bd9 100644 --- a/handlers/main.yaml +++ b/handlers/main.yaml @@ -12,33 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. --- -- name: Reload zuul-executor - become: yes - service: - name: zuul-executor - state: reloaded - when: zuul_service_zuul_executor_manage and - zuul_service_zuul_executor_state == "started" and not - zuul_service_zuul_executor.changed - -- name: Reload zuul-fingergw - become: yes - service: - name: zuul-fingergw - state: reloaded - when: zuul_service_zuul_fingergw_manage and - zuul_service_zuul_fingergw_state == "started" and not - zuul_service_zuul_fingergw.changed - -- name: Reload zuul-merger - become: yes - service: - name: zuul-merger - state: reloaded - when: zuul_service_zuul_merger_manage and - zuul_service_zuul_merger_state == "started" and not - zuul_service_zuul_merger.changed - - name: Reload zuul-scheduler become: yes service: @@ -47,12 +20,3 @@ when: zuul_service_zuul_scheduler_manage and zuul_service_zuul_scheduler_state == "started" and not zuul_service_zuul_scheduler.changed - -- name: Reload zuul-web - become: yes - service: - name: zuul-web - state: reloaded - when: zuul_service_zuul_web_manage and - zuul_service_zuul_web_state == "started" and not - zuul_service_zuul_web.changed diff --git a/tasks/config.yaml b/tasks/config.yaml index 67b8a52..1f9cfbd 100644 --- a/tasks/config.yaml +++ b/tasks/config.yaml @@ -44,7 +44,6 @@ owner: "{{ zuul_file_executor_logging_conf_owner }}" src: "{{ zuul_file_executor_logging_conf_src }}" register: zuul_file_executor_logging_conf - notify: Reload zuul-executor - name: Install fingergw logging file. become: yes @@ -55,7 +54,6 @@ owner: "{{ zuul_file_fingergw_logging_conf_owner }}" src: "{{ zuul_file_fingergw_logging_conf_src }}" register: zuul_file_fingergw_logging_conf - notify: Reload zuul-fingergw - name: Install merger logging file. become: yes @@ -66,7 +64,6 @@ owner: "{{ zuul_file_merger_logging_conf_owner }}" src: "{{ zuul_file_merger_logging_conf_src }}" register: zuul_file_merger_logging_conf - notify: Reload zuul-merger - name: Install scheduler logging file. become: yes @@ -118,7 +115,6 @@ owner: "{{ zuul_file_web_logging_conf_owner }}" src: "{{ zuul_file_web_logging_conf_src }}" register: zuul_file_web_logging_conf - notify: Reload zuul-web - name: Install layout configuration. become: yes @@ -129,7 +125,6 @@ owner: "{{ zuul_file_layout_owner }}" src: "{{ zuul_file_layout_src }}" register: zuul_file_layout - notify: Reload zuul-scheduler - name: Install zuul configuration. become: yes @@ -141,7 +136,4 @@ src: "{{ zuul_file_zuul_conf_src }}" register: zuul_file_zuul_conf notify: - - Reload zuul-executor - - Reload zuul-fingergw - - Reload zuul-merger - Reload zuul-scheduler