feature:将配置项device_seq更名为sequence_in_data_center,并加入device配置section

2021-09-14 14:28:59 +08:00
parent 21ff0f636e
commit 5fb058217c
3 changed files with 7 additions and 3 deletions
--- 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]
--- 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
--- 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