From 6590d8191c9382ce526647d7603b6056ff4dc8b1 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 16 Aug 2021 11:47:48 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E5=9C=A8Provision=E4=B8=AD=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AE=A1=E7=AE=97=E6=9D=BF=E5=8D=A1=EF=BC=88=E5=8D=95?= =?UTF-8?q?=E5=85=83=EF=BC=89=E5=9C=A8=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=A1=BA=E5=BA=8F=E5=8F=B7=E7=9A=84=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= 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 | 1 + .../files/config_sample/provision.yml.sample.9000NPBP01R01 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 792cb98b..754de32e 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -70,7 +70,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}'" -DEVICE_SEQ_IN_DATA_CENTER= +DEVICE_SEQ_IN_DATA_CENTER={{ data_center.device_seq }} [TSG_CONN_SKETCH] log_service=2 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 b24931f9..d0073616 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 @@ -16,6 +16,7 @@ coredump: data_center: name: City instance id: 1 + device_seq: 1 olap: 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 8b35687d..483cbf1b 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 @@ -16,6 +16,7 @@ coredump: data_center: name: City instance id: 1 + device_seq: 1 olap: