gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor:将data_center和tsg_master_entrance_id合并为data_center

Browse Source
This commit is contained in:
fumingwei
2021-06-22 15:03:11 +08:00
parent 29555f5f36
commit 294e85bc8a
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2
View File

@@ -18,7 +18,7 @@ FULL_CFG_DIR=capture_packet_rule/full/index/
EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
{% raw %}
ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center }}"}]}
ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center.name }}"}]}
{% endraw %}
[LOG]

2
ansible/roles/firewall/templates/maat.conf.j2.j2
View File

@@ -74,5 +74,5 @@ EFFECTIVE_RANGE_FILE=/opt/tsg/etc/tsg_device_tag.json
[MAAT]
{% raw %}
ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center }}"}]}
ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center.name }}"}]}
{% endraw %}

2
ansible/roles/firewall/templates/main.conf.j2.j2
View File

@@ -65,7 +65,7 @@ APP_NAME="tsg_master"
[SYSTEM]
NIC_NAME="{{ firewall.main_conf.SYSTEM.NIC_NAME }}"
{% raw %}
ENTRANCE_ID={{ tsg_master_entrance_id }}
ENTRANCE_ID={{ data_center.id }}
{% endraw %}
LOG_LEVEL=30
LOG_PATH="./tsglog/tsg_master"

6
ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample
View File

@@ -12,8 +12,10 @@ CM:
sentry_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3203b43fd5384a7dbe6a48ecb1f3c595
data_center: Kyzylorda
tsg_master_entrance_id: 9
data_center:
name: City instance
id: 1
log_kafkabrokers:

2
ansible/roles/tsg_device_tag/templates/tsg_device_tag.json.j2.j2
View File

@@ -1,4 +1,4 @@
[MAAT]
{% raw %}
ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center }}"}]}
ACCEPT_TAGS={"tags":[{"tag":"data_center","value":"{{ data_center.name }}"}]}
{% endraw %}