From 5fb058217c778af49b60b21ca12153ff8ca6eecc Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 14 Sep 2021 14:28:59 +0800 Subject: [PATCH] =?UTF-8?q?feature:=E5=B0=86=E9=85=8D=E7=BD=AE=E9=A1=B9dev?= =?UTF-8?q?ice=5Fseq=E6=9B=B4=E5=90=8D=E4=B8=BAsequence=5Fin=5Fdata=5Fcent?= =?UTF-8?q?er,=E5=B9=B6=E5=8A=A0=E5=85=A5device=E9=85=8D=E7=BD=AEsection?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/roles/firewall/templates/main.conf.j2.j2 | 2 +- .../files/config_sample/provision.yml.sample.7400MCN0P01R01 | 4 +++- .../files/config_sample/provision.yml.sample.9000NPBP01R01 | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index ba08b7ea..a2b248ad 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -72,7 +72,7 @@ LOG_PATH="./tsglog/tsg_master" POLICY_PRIORITY_LABEL="POLICY_PRIORITY" L7_PROTOCOL_FILE="./tsgconf/tsg_l7_protocol.conf" DEVICE_ID_COMMAND="hostname | awk -F'-' '{print $3}'| awk -F'adc' '{print $2}'" -{% raw %}DEVICE_SEQ_IN_DATA_CENTER={{ data_center.device_seq }} +{% raw %}DEVICE_SEQ_IN_DATA_CENTER={{ device.sequence_in_data_center }} {% endraw %} [TSG_CONN_SKETCH] diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 index dbc0cfcf..7f4153c1 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.7400MCN0P01R01 @@ -3,7 +3,9 @@ version: 1 data_center: name: City instance id: 1 - device_seq: 1 + +device: + sequence_in_data_center: 1 feature: enable_policy_local_cache: 1 diff --git a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 index 4be092aa..629686be 100644 --- a/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 +++ b/ansible/roles/tsg-os-provision/files/config_sample/provision.yml.sample.9000NPBP01R01 @@ -3,7 +3,9 @@ version: 1 data_center: name: City instance id: 1 - device_seq: 1 + +device: + sequence_in_data_center: 1 feature: enable_stream_bypass_under_ddos: 0