From 03b37a86d85ac51fb91ff2dbbeb5f5d631203b09 Mon Sep 17 00:00:00 2001
From: zhangzhihan <zhangzhihan@zdjizhi.com>
Date: Fri, 25 Sep 2020 15:24:41 +0800
Subject: [PATCH] update

---
 deploy.yml                                       | 12 ++++++++++++
 install_config/group_vars/adc_global.yml         |  4 ++++
 install_config/group_vars/server_as_tun_mode.yml |  4 ++++
 roles/kernel-ml/tasks/main.yml                   |  6 +++---
 roles/reboot/tasks/main.yml                      |  3 +++
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 roles/reboot/tasks/main.yml

diff --git a/deploy.yml b/deploy.yml
index de27269..555c16a 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -79,6 +79,17 @@
   roles:
     - tsg-diagnose_stop_sync
 
+- hosts:
+    - adc_mcn0
+    - adc_mcn1
+    - adc_mcn2
+    - adc_mcn3
+  remote_user: root
+  roles:
+    - reboot
+  vars_files:
+    - install_config/group_vars/adc_global.yml
+
 - hosts: server-as-tun-mode
   remote_user: root
   vars_files:
@@ -101,6 +112,7 @@
     - telegraf_statistic
     - proxy_status
 #    - tsg_device_tag
+    - reboot
 
 - hosts: app_global
   remote_user: root
diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index fa55b95..bcea705 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -4,6 +4,10 @@ tsg_access_type: 3
 #####2: ADC;
 tsg_running_type: 2
 
+########################################
+#Deploy_finished_reboot
+Deploy_finished_reboot: 1
+
 ########################################
 #IP Config
 maat_redis_server:
diff --git a/install_config/group_vars/server_as_tun_mode.yml b/install_config/group_vars/server_as_tun_mode.yml
index 4c91543..ca244c3 100644
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -4,6 +4,10 @@ tsg_access_type: 1
 #####0: Tun_mode;  1: normal;
 tsg_running_type: 1
 
+########################################
+#Deploy_finished_reboot
+Deploy_finished_reboot: 1
+
 ########################################
 #Server Basic Config
 nic_mgr:
diff --git a/roles/kernel-ml/tasks/main.yml b/roles/kernel-ml/tasks/main.yml
index 1f13b0f..9e242d2 100644
--- a/roles/kernel-ml/tasks/main.yml
+++ b/roles/kernel-ml/tasks/main.yml
@@ -40,6 +40,6 @@
     - tsg_access_type == 4
     - t_kernel_ml.changed
 
-- name: "reboot"
-  reboot:
-  when: t_kernel_ml.changed
+#- name: "reboot"
+#  reboot:
+#  when: t_kernel_ml.changed
diff --git a/roles/reboot/tasks/main.yml b/roles/reboot/tasks/main.yml
new file mode 100644
index 0000000..a9bb686
--- /dev/null
+++ b/roles/reboot/tasks/main.yml
@@ -0,0 +1,3 @@
+- name: "reboot"
+  reboot:
+  when: Deploy_finished_reboot == 1