From d3958bb0e66eb7d8e74116a0d101a0bcd5ced08c Mon Sep 17 00:00:00 2001 From: liubo Date: Sat, 16 Mar 2019 00:07:48 +0800 Subject: [PATCH] Restore pd service name (#712) --- graceful_stop.yml | 2 +- roles/pd/tasks/supervise_deployment.yml | 2 +- roles/pd/tasks/systemd_deployment.yml | 2 +- rolling_update.yml | 4 ++-- start.yml | 2 +- stop.yml | 2 +- unsafe_cleanup.yml | 2 +- unsafe_cleanup_data.yml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/graceful_stop.yml b/graceful_stop.yml index 79c631f6e..78564e322 100644 --- a/graceful_stop.yml +++ b/graceful_stop.yml @@ -310,7 +310,7 @@ when: process_supervision == 'supervise' - name: stop PD by systemd - systemd: name=pd-{{ pd_client_port }}.service state=stopped + systemd: name=pd.service state=stopped become: true when: process_supervision == 'systemd' diff --git a/roles/pd/tasks/supervise_deployment.yml b/roles/pd/tasks/supervise_deployment.yml index ce66c2a33..622b0e035 100644 --- a/roles/pd/tasks/supervise_deployment.yml +++ b/roles/pd/tasks/supervise_deployment.yml @@ -5,4 +5,4 @@ name: supervise vars: this_role_name: pd - service_name: pd-{{ pd_client_port }} + service_name: pd diff --git a/roles/pd/tasks/systemd_deployment.yml b/roles/pd/tasks/systemd_deployment.yml index 24d05a288..3a1a45936 100644 --- a/roles/pd/tasks/systemd_deployment.yml +++ b/roles/pd/tasks/systemd_deployment.yml @@ -5,4 +5,4 @@ name: systemd vars: this_role_name: pd - service_name: pd-{{ pd_client_port }} + service_name: pd diff --git a/rolling_update.yml b/rolling_update.yml index 7cbe9e7c2..54cce4ca0 100644 --- a/rolling_update.yml +++ b/rolling_update.yml @@ -73,7 +73,7 @@ when: process_supervision == 'supervise' - name: stop PD by systemd - systemd: name=pd-{{ pd_client_port }}.service state=stopped + systemd: name=pd.service state=stopped become: true when: process_supervision == 'systemd' @@ -93,7 +93,7 @@ when: process_supervision == 'supervise' - name: start PD by systemd - systemd: name=pd-{{ pd_client_port }}.service state=started + systemd: name=pd.service state=started become: true when: process_supervision == 'systemd' diff --git a/start.yml b/start.yml index 55b1ec475..63a8ad311 100644 --- a/start.yml +++ b/start.yml @@ -213,7 +213,7 @@ - pd - name: start PD by systemd - systemd: name=pd-{{ pd_client_port }}.service state=started enabled=no + systemd: name=pd.service state=started enabled=no become: true when: process_supervision == 'systemd' diff --git a/stop.yml b/stop.yml index 01e209d57..43e7f5930 100644 --- a/stop.yml +++ b/stop.yml @@ -272,7 +272,7 @@ - pd - name: stop PD by systemd - systemd: name=pd-{{ pd_client_port }}.service state=stopped + systemd: name=pd.service state=stopped become: true when: process_supervision == 'systemd' diff --git a/unsafe_cleanup.yml b/unsafe_cleanup.yml index 9768bf31d..4842c5bfd 100644 --- a/unsafe_cleanup.yml +++ b/unsafe_cleanup.yml @@ -101,7 +101,7 @@ become: true when: process_supervision == 'systemd' with_items: - - pd-{{ pd_client_port }}.service + - pd.service - hosts: grafana_servers tasks: diff --git a/unsafe_cleanup_data.yml b/unsafe_cleanup_data.yml index 522b02b27..4a7fd3dec 100644 --- a/unsafe_cleanup_data.yml +++ b/unsafe_cleanup_data.yml @@ -140,7 +140,7 @@ - pd - name: stop PD by systemd - systemd: name=pd-{{ pd_client_port }}.service state=stopped + systemd: name=pd.service state=stopped become: true when: process_supervision == 'systemd'