update

4 files changed, 61 insertions, 36 deletions

diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index cd6e96a..5e754be 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -1,6 +1,6 @@
 #########################################
 #####1: Inline_device;  2: Allot;  3: ADC_Tun_mode;
-tsg_access_type: 2
+tsg_access_type: 3
 #####2: ADC;
 tsg_running_type: 2
 
@@ -30,20 +30,21 @@ log_minio:
 #########################################
 #Log Level Config
 #日志等级 10:DEBUG 20:INFO 30:FATAL
-fw_ftp_log_level: 10
-fw_mail_log_level: 10
-fw_http_log_level: 10
-fw_dns_log_level: 10
-fw_quic_log_level: 10
-capture_packet_log_level: 10
-tsg_log_level: 10
-tsg_master_log_level: 10
-kni_log_level: 10
-tfe_log_level: 10
-tfe_http_log_level: 10
-pangu_log_level: 10
-doh_log_level: 10
-certstore_log_level: 10
+fw_ftp_log_level: 30
+fw_mail_log_level: 30
+fw_http_log_level: 30
+fw_dns_log_level: 30
+fw_quic_log_level: 30
+capture_packet_log_level: 30
+tsg_log_level: 30
+tsg_master_log_level: 30
+kni_log_level: 30
+tfe_log_level: 30
+tfe_http_log_level: 30
+pangu_log_level: 30
+doh_log_level: 30
+certstore_log_level: 30
+clotho_log_level: 10
 
 #######################################
 #Sapp Performance Config
@@ -58,7 +59,7 @@ sapp:
 #Kni Config
 kni:
   global:
-    tfe_node_count: 3
+    tfe_node_count: 1
   watch_dog:
     switch: 1
   maat:
@@ -67,8 +68,8 @@ kni:
     switch: 1
   tfe_nodes:
     tfe0_enabled: 1
-    tfe1_enabled: 1
-    tfe2_enabled: 1
+    tfe1_enabled: 0
+    tfe2_enabled: 0
 
 ########################################
 #Tfe Config
diff --git a/install_config/group_vars/adc_mcn0.yml b/install_config/group_vars/adc_mcn0.yml
index fa3998e..4d6d266 100644
--- a/install_config/group_vars/adc_mcn0.yml
+++ b/install_config/group_vars/adc_mcn0.yml
@@ -23,8 +23,8 @@ nic_to_tfe:
 #########################################
 #串联设备接入相关配置
 inline_device_config:
-  ip: 192.168.1.30
-  mask: 255.255.255.252
+  keepalive_ip: 192.168.1.30
+  keepalive_mask: 255.255.255.252
 
 #########################################
 #Allot接入相关配置
diff --git a/install_config/group_vars/server_as_tun_mode.yml b/install_config/group_vars/server_as_tun_mode.yml
index 41d584b..a77a646 100644
--- a/install_config/group_vars/server_as_tun_mode.yml
+++ b/install_config/group_vars/server_as_tun_mode.yml
@@ -1,8 +1,8 @@
 #########################################
-#####0: Pcap;  1: Inline_device;  4: ATCA;
-tsg_access_type: 0
+#####0: Pcap;  1: Inline_device;  4: ATCA_Vlan_Flipping;  5:ATCA_VXLAN;
+tsg_access_type: 1
 #####0: Tun_mode;  1: normal;
-tsg_running_type: 0
+tsg_running_type: 1
 
 ########################################
 #Server Basic Config
@@ -52,6 +52,7 @@ tfe_http_log_level: 10
 pangu_log_level: 10
 doh_log_level: 10
 certstore_log_level: 10
+clotho_log_level: 10
 
 #########################################
 #Sapp Performance Config
@@ -104,20 +105,26 @@ mrtunnat:
 #########################################
 #ATCA Config
 #下列配置只在tsg_access_type=4时生效
-nic_data_incoming:
+ATCA_data_incoming:
   ethname: enp1s0
   vf0_name: enp1s2
   vf1_name: enp1s2f1
   vf2_name: enp1s2f2
 
-VlanFlipping:
+ATCA_VlanFlipping:
   vlanID_1: 100
   vlanID_2: 101
   vlanID_3: 103
   vlanID_4: 104
 
+#下列配置只在tsg_access_type=5时生效
+ATCA_VXLAN:
+  keepalive_ip: "10.254.19.1"
+  keepalive_mask: "255.255.255.252"
+
 #########################################
 #Inline Device Config
 inline_device_config:
-  ip: 192.168.1.30
-  mask: 255.255.255.252
+  keepalive_ip: 192.168.1.30
+  keepalive_mask: 255.255.255.252
+  data_incoming: eth5
diff --git a/install_config/hosts b/install_config/hosts
index 0c36bd9..c96c98b 100644
--- a/install_config/hosts
+++ b/install_config/hosts
@@ -1,17 +1,34 @@
-[all:vars]
-ansible_user=root
-package_source=local
+###################
+#   For example   #
+###################
+#
+#[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
 
 [server-as-tun-mode]
-
 [adc_mxn]
-
 [adc_mcn0]
-
 [adc_mcn1]
-
 [adc_mcn2]
-
 [adc_mcn3]
 
-