From 374b3a83137a61274de7cf35d610c63d52c3da13 Mon Sep 17 00:00:00 2001
From: wangmenglan <wangmenglan@geedgenetworks.com>
Date: Wed, 29 Mar 2023 20:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E6=9B=B4=E6=96=B0tsg-os-?=
 =?UTF-8?q?mgnt-srv=E5=88=B01.0.33;=20=E8=B0=83=E6=95=B4firewall=E3=80=81s?=
 =?UTF-8?q?ce=E3=80=81shaping=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/install_config/group_vars/rpm_version.yml         | 2 +-
 ansible/roles/traffic-engine/files/helm/conf/sapp.toml    | 2 +-
 ansible/roles/traffic-engine/files/helm/conf/sce.conf     | 2 +-
 ansible/roles/traffic-engine/files/helm/conf/shaping.conf | 2 +-
 ansible/roles/traffic-engine/files/helm/values.yaml       | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml
index 168e4fc8..fd59b972 100644
--- a/ansible/install_config/group_vars/rpm_version.yml
+++ b/ansible/install_config/group_vars/rpm_version.yml
@@ -99,7 +99,7 @@ hasp_update_rpm_version:
 tsg_os_clixon_rpm_version:
   cligen: cligen-5.8.0-release
   clixon: clixon-5.8.0-release
-  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.32.098f92c
+  tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.33.e229220
 
 sce_rpm_version:
   sce: sce-1.0.7.66d6a26
diff --git a/ansible/roles/traffic-engine/files/helm/conf/sapp.toml b/ansible/roles/traffic-engine/files/helm/conf/sapp.toml
index 405336d0..0d509301 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/sapp.toml
+++ b/ansible/roles/traffic-engine/files/helm/conf/sapp.toml
@@ -6,7 +6,7 @@
 ###################################################################################################
 
 [SYSTEM]
-instance_name = "sapp4-{{ .Release.Name }}"
+instance_name = "sapp4-{{ .Values.app_symbol_index }}"
 
 [CPU]
 ### note, bind_mask, if you do not want to bind thread to special CPU core, keep it empty as []
diff --git a/ansible/roles/traffic-engine/files/helm/conf/sce.conf b/ansible/roles/traffic-engine/files/helm/conf/sce.conf
index f3cad9fa..314ca2b1 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/sce.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/sce.conf
@@ -36,7 +36,7 @@ max_chaining_size=32
 # bypass_all_traffic:1 NF2NF and SF2SF
 bypass_all_traffic=0
 rx_burst_max=128
-app_symbol=sce_{{ .Release.Name }}
+app_symbol=sce_{{ .Values.app_symbol_index }}
 dev_endpoint={{ .Values.sce_config.endpoint_nic }}
 dev_nf_interface={{ .Values.sce_config.steering_nic }}
 dev_endpoint_src_ip={{ .Values.sce_config.endpoint_ip }}
diff --git a/ansible/roles/traffic-engine/files/helm/conf/shaping.conf b/ansible/roles/traffic-engine/files/helm/conf/shaping.conf
index 0e6d3df2..5770dab4 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/shaping.conf
+++ b/ansible/roles/traffic-engine/files/helm/conf/shaping.conf
@@ -7,7 +7,7 @@ firewall_sids={{ .Values.sid.firewall }}
 [MARSIO]
 DEV_INTERFACE="{{ .Values.shaping_config.shaping_nic }}"
 RX_BRUST_MAX=1
-APP_SYMBOL="shaping_{{ .Release.Name }}"
+APP_SYMBOL="shaping_{{ .Values.app_symbol_index }}"
 
 [MAAT]
 INPUT_MODE=1
diff --git a/ansible/roles/traffic-engine/files/helm/values.yaml b/ansible/roles/traffic-engine/files/helm/values.yaml
index bb6ef100..64207577 100644
--- a/ansible/roles/traffic-engine/files/helm/values.yaml
+++ b/ansible/roles/traffic-engine/files/helm/values.yaml
@@ -182,3 +182,5 @@ sid:
 
 shaping_config:
   shaping_nic: nf_1_shaping_engine
+
+app_symbol_index: 1