From 4ae7c7e3292427e1e7e491e90474127477b0c312 Mon Sep 17 00:00:00 2001
From: zhangzhihan <zhangzhihan@zdjizhi.com>
Date: Mon, 28 Sep 2020 21:55:04 +0800
Subject: [PATCH] update

---
 deploy.yml                               |  6 +++--
 install_config/group_vars/adc_global.yml | 34 ++++++++++++------------
 install_config/group_vars/adc_mcn0.yml   |  2 +-
 install_config/group_vars/adc_mcn1.yml   |  2 +-
 install_config/group_vars/adc_mcn2.yml   |  2 +-
 install_config/group_vars/adc_mcn3.yml   |  2 +-
 uninstall/roles/package_list/20.09.yml   |  2 +-
 uninstall/roles/tfe/tasks/main.yml       |  1 +
 8 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/deploy.yml b/deploy.yml
index 9a7ee8d..13d3f1c 100644
--- a/deploy.yml
+++ b/deploy.yml
@@ -3,8 +3,10 @@
     - adc_mcn1
     - adc_mcn2
     - adc_mcn3
- remote_user: root
- roles:
+  remote_user: root
+  vars_files:
+    - install_config/group_vars/adc_global.yml
+  roles:
     - framework
     - kernel-ml
 
diff --git a/install_config/group_vars/adc_global.yml b/install_config/group_vars/adc_global.yml
index bcea705..bd203a3 100644
--- a/install_config/group_vars/adc_global.yml
+++ b/install_config/group_vars/adc_global.yml
@@ -34,20 +34,20 @@ log_minio:
 #########################################
 #Log Level Config
 #日志等级 10:DEBUG 20:INFO 30:FATAL
-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
+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
 clotho_log_level: 10
 
 #######################################
@@ -85,14 +85,14 @@ tfe:
 #Marsio Config
 #marsio工作在ADC计算板时，建议使用如下配置，以保证更高的处理性能
 mrzcpd:
-  iocore: 44,45,46,47
+  iocore: 52,53,54,55
 
 mrtunnat:
-  lcore_id: 40,41,42,43
+  lcore_id: 48,49,50,51 
 
 #########################################
 #Tsg_app
-tsg_app_enable: 1
+tsg_app_enable: 0
 app_global_ip: "1.1.1.1"
 applog_level: 10
 app_master_log_level: 10
diff --git a/install_config/group_vars/adc_mcn0.yml b/install_config/group_vars/adc_mcn0.yml
index 4d6d266..114696b 100644
--- a/install_config/group_vars/adc_mcn0.yml
+++ b/install_config/group_vars/adc_mcn0.yml
@@ -1,7 +1,7 @@
 #########################################
 #Mcn0管理口网卡名
 nic_mgr:
-  name: enp6s0
+  name: ens1f3
 
 #########################################
 #Mcn0流量接入网卡，固定配置
diff --git a/install_config/group_vars/adc_mcn1.yml b/install_config/group_vars/adc_mcn1.yml
index d172f7f..2962d9b 100644
--- a/install_config/group_vars/adc_mcn1.yml
+++ b/install_config/group_vars/adc_mcn1.yml
@@ -1,7 +1,7 @@
 #########################################
 #Mcn1管理口网卡名
 nic_mgr:
-  name: enp6s0
+  name: ens1f3
 
 #########################################
 #Mcn1流量接入网卡，固定配置
diff --git a/install_config/group_vars/adc_mcn2.yml b/install_config/group_vars/adc_mcn2.yml
index 4274e70..3c6524c 100644
--- a/install_config/group_vars/adc_mcn2.yml
+++ b/install_config/group_vars/adc_mcn2.yml
@@ -1,7 +1,7 @@
 #########################################
 #Mcn2管理口网卡名
 nic_mgr:
-  name: enp6s0
+  name: ens8f3
 
 #########################################
 #Mcn2流量接入网卡，固定配置
diff --git a/install_config/group_vars/adc_mcn3.yml b/install_config/group_vars/adc_mcn3.yml
index 9359c76..53ade21 100644
--- a/install_config/group_vars/adc_mcn3.yml
+++ b/install_config/group_vars/adc_mcn3.yml
@@ -1,7 +1,7 @@
 #########################################
 #Mcn3管理口网卡名
 nic_mgr:
-  name: enp6s0
+  name: ens8f3
 
 #########################################
 #Mcn3流量接入网卡，固定配置
diff --git a/uninstall/roles/package_list/20.09.yml b/uninstall/roles/package_list/20.09.yml
index 8251d1e..02c6ea0 100644
--- a/uninstall/roles/package_list/20.09.yml
+++ b/uninstall/roles/package_list/20.09.yml
@@ -37,7 +37,7 @@ sapp: sapp-4.1.7.4f2839a-1.x86_64
 
 ####################
 #tsg_master
-tsg_master: tsg_master-3.2.8.e57ad7f-1.x86_64
+tsg_master: tsg_master-3.2.9.d1a6f00-1.x86_64
 
 ####################
 #kni
diff --git a/uninstall/roles/tfe/tasks/main.yml b/uninstall/roles/tfe/tasks/main.yml
index 3198b30..de736d1 100644
--- a/uninstall/roles/tfe/tasks/main.yml
+++ b/uninstall/roles/tfe/tasks/main.yml
@@ -22,5 +22,6 @@
   yum:
     name:
       - "{{ tfe }}"
+      - "{{ tfe_kmod }}"
     state: absent
   when: uninstall.tfe == 1