summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangzhihan <[email protected]>2020-09-25 15:24:41 +0800
committerzhangzhihan <[email protected]>2020-09-25 15:24:41 +0800
commit03b37a86d85ac51fb91ff2dbbeb5f5d631203b09 (patch)
tree5b698e77ce745415ab848a854ee47f9f70638b89
parent5aba47de31c319001561f79fd2e130f864f5ed65 (diff)
update
-rw-r--r--deploy.yml12
-rw-r--r--install_config/group_vars/adc_global.yml4
-rw-r--r--install_config/group_vars/server_as_tun_mode.yml4
-rw-r--r--roles/kernel-ml/tasks/main.yml6
-rw-r--r--roles/reboot/tasks/main.yml3
5 files changed, 26 insertions, 3 deletions
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
@@ -5,6 +5,10 @@ tsg_access_type: 3
tsg_running_type: 2
########################################
+#Deploy_finished_reboot
+Deploy_finished_reboot: 1
+
+########################################
#IP Config
maat_redis_server:
address: "192.168.40.168"
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
@@ -5,6 +5,10 @@ tsg_access_type: 1
tsg_running_type: 1
########################################
+#Deploy_finished_reboot
+Deploy_finished_reboot: 1
+
+########################################
#Server Basic Config
nic_mgr:
name: eth0
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