From 8ec3ebcf6f77f61121490c85246a30f6a03879e9 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Fri, 30 Oct 2020 12:31:02 +0600
Subject: [PATCH] 1. delete kyzylorda host.bak 2. modify role reoboot,delele
 when

---
 Kyzylorda_install_config/hosts     |  8 ++---
 Kyzylorda_install_config/hosts.bak | 47 ------------------------------
 roles/reboot/tasks/main.yml        |  2 +-
 3 files changed, 5 insertions(+), 52 deletions(-)
 delete mode 100644 Kyzylorda_install_config/hosts.bak

diff --git a/Kyzylorda_install_config/hosts b/Kyzylorda_install_config/hosts
index 7a23c6e..62abb57 100644
--- a/Kyzylorda_install_config/hosts
+++ b/Kyzylorda_install_config/hosts
@@ -36,12 +36,12 @@
 #p
 #[adc_mxn]
 [adc_mcn0]
-10.9.51.1
+10.9.51.[1:15]
 [adc_mcn1]
-10.9.52.1
+10.9.52.[1:15]
 [adc_mcn2]
-10.9.53.1
+10.9.53.[1:15]
 [adc_mcn3]
-10.9.54.1
+10.9.54.[1:14]
 [packet_dump_server]
 10.9.61.3
diff --git a/Kyzylorda_install_config/hosts.bak b/Kyzylorda_install_config/hosts.bak
deleted file mode 100644
index a943267..0000000
--- a/Kyzylorda_install_config/hosts.bak
+++ /dev/null
@@ -1,47 +0,0 @@
-###################
-#   For example   #
-###################
-#变量device_id根据设备序号设置即可
-#变量vvipv4_1、vvipv4_2、vvipv6_1、vvipv6_2为Allot相关配置，其他环境可不填或直接删除变量
-#
-#20.09版本新增APP部署
-#[app_global]
-#0.0.0.0
-
-#[server-as-tun-mode]
-#1.1.1.1 device_id=device_1
-#
-#[adc_mxn]
-#10.3.72.1
-#10.3.72.2
-#
-#[adc_mcn0]
-#10.3.73.1 device_id=device_1 vvipv4_1=10.3.61.1 vvipv4_2=10.3.62.1 vvipv6_1=fc00::61:1 vvipv6_2=fc00::62:1
-#10.3.73.2 device_id=device_2 vvipv4_1=10.3.61.2 vvipv4_2=10.3.62.2 vvipv6_1=fc00::61:2 vvipv6_2=fc00::62:2
-#
-#[adc_mcn1]
-#10.3.74.1 device_id=device_1
-#10.3.74.2 device_id=device_2
-#
-#[adc_mcn2]
-#10.3.75.1 device_id=device_1
-#10.3.75.2 device_id=device_2
-#
-#[adc_mcn3]
-#10.3.76.1 device_id=device_1
-#10.3.76.2 device_id=device_2
-
-#[app_global]
-#[server-as-tun-mode]
-#p
-#[adc_mxn]
-[adc_mcn0]
-10.9.51.[1:15]
-[adc_mcn1]
-10.9.52.[1:15]
-[adc_mcn2]
-10.9.53.[1:15]
-[adc_mcn3]
-10.9.54.[1:15]
-[packet_dump_server]
-10.9.61.3
diff --git a/roles/reboot/tasks/main.yml b/roles/reboot/tasks/main.yml
index ea44f39..319d644 100644
--- a/roles/reboot/tasks/main.yml
+++ b/roles/reboot/tasks/main.yml
@@ -1,3 +1,3 @@
 - name: "reboot"
   reboot:
-  when: Deploy_finished_reboot == 1
+#  when: Deploy_finished_reboot == 1