晚上服务器部署模式tsg-version20.11-deploy

6 files changed, 45 insertions, 19 deletions

diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index 3b03699..3977194 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -9,6 +9,10 @@ tsg_running_type: 2
 Deploy_finished_reboot: 0
 
 ########################################
+#TSG Cluster Mode
+tsg_cluster_mode: 0
+
+########################################
 #IP Config
 maat_redis_city_server:
   address: "10.9.62.253"
diff --git a/install_config/group_vars/adc_mcn0.yml b/install_config/group_vars/adc_mcn0.yml
index 60bfaf0..d0d8227 100644
--- a/install_config/group_vars/adc_mcn0.yml
+++ b/install_config/group_vars/adc_mcn0.yml
@@ -37,5 +37,5 @@ AllotAccess:
   virturlID_4: 1302
   #vvipv4_mask: 24
   #vvipv6_mask: 64
-
+ 
 bladename: mcn0
diff --git a/install_config/group_vars/adc_mcn2.yml b/install_config/group_vars/adc_mcn2.yml
index ff33049..10d00df 100644
--- a/install_config/group_vars/adc_mcn2.yml
+++ b/install_config/group_vars/adc_mcn2.yml
@@ -15,5 +15,5 @@ nic_inner_ctrl:
 nic_traffic_mirror:
   name: ens8f2
   use_mrzcpd: 1
-  
+
 bladename: mcn2
\ No newline at end of file
diff --git a/install_config/group_vars/adc_mcn3.yml b/install_config/group_vars/adc_mcn3.yml
index 51b1e09..df3846c 100644
--- a/install_config/group_vars/adc_mcn3.yml
+++ b/install_config/group_vars/adc_mcn3.yml
@@ -15,5 +15,5 @@ nic_inner_ctrl:
 nic_traffic_mirror:
   name: ens8f2
   use_mrzcpd: 1
-  
+
 bladename: mcn3
\ No newline at end of file
diff --git a/install_config/group_vars/server_as_tun_mode.yml b/install_config/group_vars/server_as_tun_mode.yml
index f4ef823..21bc996 100644
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -1,12 +1,16 @@
 #########################################
 #####0: Pcap;  1: Inline_device;  4: ATCA_Vlan_Flipping;  5:ATCA_VXLAN;
-tsg_access_type: 1
+tsg_access_type: 0
 #####0: Tun_mode;  1: normal;
-tsg_running_type: 1
+tsg_running_type: 0
 
 ########################################
 #Deploy_finished_reboot
-Deploy_finished_reboot: 1
+Deploy_finished_reboot: 0
+
+########################################
+#TSG Cluster Mode
+tsg_cluster_mode: 0
 
 ########################################
 #Server Basic Config
@@ -18,27 +22,39 @@ nic_inner_ctrl:
 
 #########################################
 #IP Config
+#maat_redis_city_serve相关配置只在部署集群模式时使用
+maat_redis_city_server:
+  address: ""
+  port: 
+
 maat_redis_server:
-  address: "192.168.40.168"
+  address: "#Bifang IP#"
   port: 7002
+  port_num: 1
   db: 0
 
 dynamic_maat_redis_server:
-  address: "192.168.40.168"
+  address: "#Bifang IP#"
   port: 7002
-  db: 0
+  port_num: 1
+  db: 1
 
 cert_store_server:
   address: "192.168.100.1"
   port: 9991
 
 log_kafkabrokers:
-  address: "1.1.1.1:9092,2.2.2.2:9092"
+  address: "10.9.61.4:9092,10.9.61.5:9092,10.9.61.6:9092"
+
+telegraf_kafkabrokers:
+  address: "\"10.9.61.4:9092\",\"10.9.61.5:9092\",\"10.9.61.6:9092\""
+
+monitor_outputs_influxdb:
+  url: "http://127.0.0.1:58086"
 
 log_minio:
-  address: "192.168.40.168;"
+  address: "10.9.62.253"
   port: 9090
-
 #########################################
 #Log Level Config
 #日志等级 10:DEBUG 20:INFO 30:FATAL
@@ -52,12 +68,11 @@ tsg_log_level: 10
 tsg_master_log_level: 10
 kni_log_level: 10
 
-
 #日志等级 DEBUG INFO FATAL
-tfe_log_level: DEBUG
-tfe_http_log_level: DEBUG
-pangu_log_level: DEBUG
-doh_log_level: DEBUG
+tfe_log_level: FATAL
+tfe_http_log_level: FATAL
+pangu_log_level: FATAL
+doh_log_level: FATAL
 
 certstore_log_level: 10
 packet_dump_log_level: 10
@@ -143,3 +158,10 @@ inline_device_config:
   keepalive_ip: 192.168.1.30
   keepalive_mask: 255.255.255.252
   data_incoming: eth5
+
+#########################################
+#新增配置项,均为默认值不用改
+breakpad_upload_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3556bac347c74585a994eb6823faf5c6
+
+data_center: Beijing
+tsg_master_entrance_id: 0
diff --git a/install_config/hosts b/install_config/hosts
index 870fdfc..8715518 100644
--- a/install_config/hosts
+++ b/install_config/hosts
@@ -7,7 +7,6 @@
 #20.09版本新增APP部署
 #[app_global]
 #0.0.0.0
-
 #[server-as-tun-mode]
 #1.1.1.1 device_id=device_1
 #
@@ -30,8 +29,8 @@
 #[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]
@@ -45,3 +44,4 @@
 10.9.54.[1:14]
 [packet_dump_server]
 10.9.61.3
+