From bba9c5680ed66a98bc2b03d607640b145c514a73 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Fri, 24 Nov 2023 10:29:56 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E5=A4=8D7400=E5=92=8C9140?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ansible/roles/firewall/templates/main.conf.j2.j2       | 2 +-
 ansible/roles/traffic-engine/files/helm/conf/spec.toml | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2
index 8becaeb1..0098e67d 100644
--- a/ansible/roles/firewall/templates/main.conf.j2.j2
+++ b/ansible/roles/firewall/templates/main.conf.j2.j2
@@ -108,7 +108,7 @@ PUBLISH_TOPIC="APP_SIGNATURE_ID"
 [qdpi_detector]
 debug_swtich=30
 intput_max_packet=20
-qmdpi_engine_config=injection_mode=stream;nb_workers={{- include "traffic-engine.sapp.workerthread" . }};nb_flows=8000;basic_dpi_enable=1;classification_cache_enable=0;fm_flow_table_alloc_mode=0
+qmdpi_engine_config=injection_mode=stream;nb_workers={{ workload_firewall.worker_threads }};nb_flows=8000;basic_dpi_enable=1;classification_cache_enable=0;fm_flow_table_alloc_mode=0
 
 [TSG_DDOS_SKETCH]
 debug_swtich=30
diff --git a/ansible/roles/traffic-engine/files/helm/conf/spec.toml b/ansible/roles/traffic-engine/files/helm/conf/spec.toml
index 4f8b484c..3ca6d24e 100644
--- a/ansible/roles/traffic-engine/files/helm/conf/spec.toml
+++ b/ansible/roles/traffic-engine/files/helm/conf/spec.toml
@@ -25,14 +25,16 @@ path = "./stellar_plugin/sf_classifier.so"
 init = "sf_classifier_init"
 exit = "sf_classifier_exit"
 
-{{- if eq .Values.appsketch.qdpi_detector .Values.define_enable_val_yes }}
+
+{{- if and (eq .Values.appsketch.qdpi_detector .Values.define_enable_val_yes) (eq .Values.appsketch.enable .Values.define_enable_val_yes) }}
 [[plugin]]
 path = "./stellar_plugin/qdpi_detector/qdpi_detector.so"
 init = "qdpi_detector_init"
 exit = "qdpi_detector_destroy"
 {{- end }}
 
-{{- if eq .Values.appsketch.context_based_detector .Values.define_enable_val_yes }}
+
+{{- if and (eq .Values.appsketch.context_based_detector .Values.define_enable_val_yes) (eq .Values.appsketch.enable .Values.define_enable_val_yes) }}
 [[plugin]]
 path = "./stellar_plugin/context_based_detector.so"
 init = "context_based_detector_init"