From 86a61c6feb84aafaa1b1116bce0bf360d87b2ad3 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Tue, 13 Sep 2022 12:14:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9Atsg=5Fmaster?= =?UTF-8?q?=E3=80=81libmaatframe=E3=80=81app=5Fsketch=5Flocal,=E6=96=B0?= =?UTF-8?q?=E5=A2=9E:=20TSG-11860=20-=20=E5=8A=9F=E8=83=BD=E7=AB=AF?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8C=B9=E9=85=8DTunnel=20Object=E4=BD=9C?= =?UTF-8?q?=E4=B8=BA=E7=AD=96=E7=95=A5=E6=9D=A1=E4=BB=B6=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E8=BE=93=E5=87=BATunnel=20Object=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=87=B3=E5=AE=89=E5=85=A8=E6=97=A5=E5=BF=97=E5=92=8C=E8=BF=87?= =?UTF-8?q?=E6=B8=A1=E6=97=A5=E5=BF=97=20TSG-11848=20-=20=E4=B8=BA?= =?UTF-8?q?=E9=80=82=E5=BA=94K8S=E5=AE=B9=E5=99=A8=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=EF=BC=8Ctsg=5Fmaster=E5=A2=9E=E5=8A=A0=E4=BB=8E=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD=E8=AF=BB=E5=85=A5=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=9C=BAIP=E7=9A=84=E5=8A=9F=E8=83=BD=20TSG-11481=20-?= =?UTF-8?q?=20app=5Fsketch=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88lua=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E5=99=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?app=E8=87=AA=E5=AE=9A=E4=B9=89=E8=84=9A=E6=9C=AC=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/install_config/group_vars/rpm_version.yml | 6 +++--- ansible/roles/sapp/templates/conflist.inf.j2.j2 | 1 + ansible/roles/sapp/templates/entrylist.conf.j2 | 3 ++- ansible/roles/traffic-engine/files/helm/conf/conflist.inf | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index 6458cc92..1dc2a1c2 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -53,7 +53,7 @@ framework_rpm_version: 13_libMV_Sketch: libMV_Sketch-2.1.2.20220225.dc6bb95 14_librdkafka: librdkafka-1.2.2.1218b3c 15_libMESA_jump_layer: libMESA_jump_layer-1.0.10.6fb4738 - 16_libmaatframe: libmaatframe-3.6.11.47a7101 + 16_libmaatframe: libmaatframe-3.6.12.f88f730 kni_rpm_version: kni: kni-5.0.2.6cb27c3 @@ -72,10 +72,10 @@ tfe_rpm_version: tfe-pr: tfe-pr-4.6.18.69f76bb tsg_app_rpm_version: - app_sketch_local: app_sketch_local-4.4.0.bf53e69 + app_sketch_local: app_sketch_local-4.5.0.af92eb0 tsg_master_rpm_version: - tsg_master: tsg_master-5.8.1.d9132ee + tsg_master: tsg_master-5.8.4.7e6dcfb tsg_diagnose_rpm_version: tsg_diagnose: tsg-diagnose-2.0.1.8c7e9cc diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2 b/ansible/roles/sapp/templates/conflist.inf.j2.j2 index 03de7157..b365d81c 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2 @@ -38,6 +38,7 @@ ./plug/protocol/stratum/stratum.inf ./plug/protocol/rdp/rdp.inf ./plug/protocol/bgp/bgp.inf +./plug/protocol/dtls/dtls.inf [business] {% raw %}{% if app_behavior.enable == 1 %} diff --git a/ansible/roles/sapp/templates/entrylist.conf.j2 b/ansible/roles/sapp/templates/entrylist.conf.j2 index 72b5b75d..54f344d2 100644 --- a/ansible/roles/sapp/templates/entrylist.conf.j2 +++ b/ansible/roles/sapp/templates/entrylist.conf.j2 @@ -23,4 +23,5 @@ RADIUS SOCKS STRATUM RDP -BGP \ No newline at end of file +BGP +DTLS \ No newline at end of file diff --git a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf index d9ec0c72..e1aaed98 100644 --- a/ansible/roles/traffic-engine/files/helm/conf/conflist.inf +++ b/ansible/roles/traffic-engine/files/helm/conf/conflist.inf @@ -31,6 +31,7 @@ ./plug/protocol/stratum/stratum.inf ./plug/protocol/rdp/rdp.inf ./plug/protocol/bgp/bgp.inf +./plug/protocol/dtls/dtls.inf [business] {{- if eq .Values.encrypt_traffic_identify.voice_bahavior_engine .Values.define_enable_val_yes }}