diff options
| author | liuxueli <[email protected]> | 2021-11-24 14:17:06 +0300 |
|---|---|---|
| committer | 付明卫 <[email protected]> | 2021-11-24 11:25:25 +0000 |
| commit | c0e7fbec56fda52b056bca4f038fb3dce4fa3073 (patch) | |
| tree | c516b78d5848acd7aaaa1711c9dc09e45b965216 | |
| parent | 8b61ce3199b121a6c475ac1579f18fcc62a106a3 (diff) | |
TSG-8650: 将tsg_master挂载app_proto_identify前面，保证IP的优先级最高v21.11-rc5
| -rw-r--r-- | ansible/roles/sapp/templates/conflist.inf.j2.j2.7400MCN0P01R01 | 2 | ||||
| -rw-r--r-- | 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 %} |