From 17201841ad3a5df8e15b6ed316103d5ec8a4674f Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Mon, 31 May 2021 16:50:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A8enable=20systemd=20s?=
 =?UTF-8?q?ervice=20=E6=97=B6=20daemon=5Freload=20=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsg-9140-scripts/roles/certstore/tasks/main.yml          | 6 +++---
 tsg-9140-scripts/roles/docker/tasks/main.yml             | 3 ++-
 tsg-9140-scripts/roles/exporter/tasks/main.yml           | 6 +++---
 tsg-9140-scripts/roles/maat-redis/tasks/main.yml         | 1 -
 tsg-9140-scripts/roles/mrzcpd/tasks/main.yml             | 4 ++++
 tsg-9140-scripts/roles/sapp/tasks/main.yml               | 1 +
 tsg-9140-scripts/roles/system-init/tasks/main.yml        | 1 +
 tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml | 4 ++--
 tsg-9140-scripts/roles/tfe/tasks/main.yml                | 2 ++
 tsg-9140-scripts/roles/tsg-os-provision/tasks/main.yml   | 1 +
 10 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/tsg-9140-scripts/roles/certstore/tasks/main.yml b/tsg-9140-scripts/roles/certstore/tasks/main.yml
index d38db270..967e20e9 100644
--- a/tsg-9140-scripts/roles/certstore/tasks/main.yml
+++ b/tsg-9140-scripts/roles/certstore/tasks/main.yml
@@ -46,12 +46,12 @@
 - name: "start certstore"
   systemd:
     name: certstore.service
-    state: started
     enabled: yes
+    daemon_reload: yes
 
 ##################### cert-redis #####################
 - name: "start cert-redis"
   systemd:
     name: cert-redis.service
-    state: started
-    enabled: yes
\ No newline at end of file
+    enabled: yes
+    daemon_reload: yes
\ No newline at end of file
diff --git a/tsg-9140-scripts/roles/docker/tasks/main.yml b/tsg-9140-scripts/roles/docker/tasks/main.yml
index d314e6ff..738bed6e 100644
--- a/tsg-9140-scripts/roles/docker/tasks/main.yml
+++ b/tsg-9140-scripts/roles/docker/tasks/main.yml
@@ -18,4 +18,5 @@
 - name: "enable docker"
   systemd:
     name: docker
-    enabled: yes
\ No newline at end of file
+    enabled: yes
+    daemon_reload: yes
\ No newline at end of file
diff --git a/tsg-9140-scripts/roles/exporter/tasks/main.yml b/tsg-9140-scripts/roles/exporter/tasks/main.yml
index 9d91450b..95af8bb8 100644
--- a/tsg-9140-scripts/roles/exporter/tasks/main.yml
+++ b/tsg-9140-scripts/roles/exporter/tasks/main.yml
@@ -50,16 +50,16 @@
   systemd:
     name: exporter-node
     enabled: yes
-    state: started
+    daemon_reload: yes
 
 - name: 'exporter-systemd service start'
   systemd:
     name: exporter-systemd
     enabled: yes
-    state: restarted
+    daemon_reload: yes
 
 - name: 'exporter-ipmi service start'
   systemd:
     name: exporter-ipmi
     enabled: yes
-    state: restarted
+    daemon_reload: yes
diff --git a/tsg-9140-scripts/roles/maat-redis/tasks/main.yml b/tsg-9140-scripts/roles/maat-redis/tasks/main.yml
index 7d7d1a04..7e7fd0be 100644
--- a/tsg-9140-scripts/roles/maat-redis/tasks/main.yml
+++ b/tsg-9140-scripts/roles/maat-redis/tasks/main.yml
@@ -19,7 +19,6 @@
 - name: "start maat-redis"
   systemd:
     name: maat-redis.service
-    state: started
     daemon_reload: yes
     enabled: yes
 
diff --git a/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml b/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml
index 3177aff7..6482642b 100644
--- a/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml
+++ b/tsg-9140-scripts/roles/mrzcpd/tasks/main.yml
@@ -20,18 +20,22 @@
   systemd:
     name: mrenv
     enabled: yes
+    daemon_reload: yes
 
 - name: "enable mrzcpd"
   systemd:
     name: mrzcpd
     enabled: yes
+    daemon_reload: yes
 
 - name: "enable prometheus output - monit_device"
   systemd:
     name: mrapm_device
     enabled: yes
+    daemon_reload: yes
 
 - name: "enable prometheus output - monit_stream"
   systemd:
     name: mrapm_stream
     enabled: yes
+    daemon_reload: yes
diff --git a/tsg-9140-scripts/roles/sapp/tasks/main.yml b/tsg-9140-scripts/roles/sapp/tasks/main.yml
index b8acf3e6..02b3e344 100644
--- a/tsg-9140-scripts/roles/sapp/tasks/main.yml
+++ b/tsg-9140-scripts/roles/sapp/tasks/main.yml
@@ -115,3 +115,4 @@
   systemd:
     name: sapp
     enabled: yes
+    daemon_reload: yes
diff --git a/tsg-9140-scripts/roles/system-init/tasks/main.yml b/tsg-9140-scripts/roles/system-init/tasks/main.yml
index 18be8c70..755773b0 100644
--- a/tsg-9140-scripts/roles/system-init/tasks/main.yml
+++ b/tsg-9140-scripts/roles/system-init/tasks/main.yml
@@ -121,3 +121,4 @@
   systemd:
     name: sshd
     enabled: yes
+    daemon_reload: yes
diff --git a/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml b/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml
index ab12cbd8..7216e69a 100644
--- a/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml
+++ b/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml
@@ -32,5 +32,5 @@
 - name: "Start telegraf_statistic"
   systemd:
     name: telegraf_statistic.service
-    state: started
-    enabled: yes
\ No newline at end of file
+    enabled: yes
+    daemon_reload: yes
\ No newline at end of file
diff --git a/tsg-9140-scripts/roles/tfe/tasks/main.yml b/tsg-9140-scripts/roles/tfe/tasks/main.yml
index b88ef4ea..189bb33b 100644
--- a/tsg-9140-scripts/roles/tfe/tasks/main.yml
+++ b/tsg-9140-scripts/roles/tfe/tasks/main.yml
@@ -79,8 +79,10 @@
   systemd:
     name: tfe-env
     enabled: yes
+    daemon_reload: yes
 
 - name: "enable tfe"
   systemd:
     name: tfe
     enabled: yes
+    daemon_reload: yes
diff --git a/tsg-9140-scripts/roles/tsg-os-provision/tasks/main.yml b/tsg-9140-scripts/roles/tsg-os-provision/tasks/main.yml
index f6cc2e7a..43b24e1b 100644
--- a/tsg-9140-scripts/roles/tsg-os-provision/tasks/main.yml
+++ b/tsg-9140-scripts/roles/tsg-os-provision/tasks/main.yml
@@ -28,6 +28,7 @@
   systemd:
     name: "{{ item }}"
     enabled: yes
+    daemon_reload: yes
   with_items:
     - tsg-os-provision
     - tsg-os-provision-convertor