From c0e7fbec56fda52b056bca4f038fb3dce4fa3073 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Wed, 24 Nov 2021 14:17:06 +0300 Subject: [PATCH] =?UTF-8?q?TSG-8650:=20=E5=B0=86tsg=5Fmaster=E6=8C=82?= =?UTF-8?q?=E8=BD=BDapp=5Fproto=5Fidentify=E5=89=8D=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E4=BF=9D=E8=AF=81IP=E7=9A=84=E4=BC=98=E5=85=88=E7=BA=A7?= =?UTF-8?q?=E6=9C=80=E9=AB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 | 2 +- ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 index fc2d04bb..a4ecf064 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 @@ -3,6 +3,7 @@ ./plug/platform/wannat/wangw.inf ./plug/platform/wire_graft/wire_graft.inf {% endif %} +./plug/platform/tsg_master/tsg_master.inf {% if connsketch.enable is defined %} {% if connsketch.enable == 1 %} ./plug/platform/app_proto_identify/app_proto_identify.inf @@ -12,7 +13,6 @@ ./plug/platform/app_proto_identify/app_proto_identify.inf {% endif %} {% endif %} -./plug/platform/tsg_master/tsg_master.inf {% if app.identify_by.builtin_app_engine == 1 %} ./plug/platform/app_proto_engine/app_proto_engine.inf {% endif %} diff --git a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 index 03606379..890e8a05 100644 --- a/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 +++ b/ansible/roles/sapp/templates/conflist.inf.j2.j2.9000NPBP01R01 @@ -3,6 +3,7 @@ ./plug/platform/wannat/wangw.inf ./plug/platform/wire_graft/wire_graft.inf {% endif %} +./plug/platform/tsg_master/tsg_master.inf {% if connsketch.enable is defined %} {% if connsketch.enable == 1 %} ./plug/platform/app_proto_identify/app_proto_identify.inf @@ -12,7 +13,6 @@ ./plug/platform/app_proto_identify/app_proto_identify.inf {% endif %} {% endif %} -./plug/platform/tsg_master/tsg_master.inf {% if app.identify_by.builtin_app_engine == 1 %} ./plug/platform/app_proto_engine/app_proto_engine.inf {% endif %}