diff --git a/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 b/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 index c368b8cb..16e2c27c 100644 --- a/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 +++ b/ansible/roles/firewall/templates/capture_packet_plug.conf.j2.j2 @@ -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] diff --git a/ansible/roles/firewall/templates/maat.conf.j2.j2 b/ansible/roles/firewall/templates/maat.conf.j2.j2 index 221b9991..b75a2ce4 100644 --- a/ansible/roles/firewall/templates/maat.conf.j2.j2 +++ b/ansible/roles/firewall/templates/maat.conf.j2.j2 @@ -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 %} diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 4fef0697..22045dfe 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -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" diff --git a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample index acc6c0c0..245438e0 100644 --- a/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample +++ b/ansible/roles/tsg-os-provision/files/tsg-os-provision/provision.yml.sample @@ -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: diff --git a/ansible/roles/tsg_device_tag/templates/tsg_device_tag.json.j2.j2 b/ansible/roles/tsg_device_tag/templates/tsg_device_tag.json.j2.j2 index 1526e2c0..2158132a 100644 --- a/ansible/roles/tsg_device_tag/templates/tsg_device_tag.json.j2.j2 +++ b/ansible/roles/tsg_device_tag/templates/tsg_device_tag.json.j2.j2 @@ -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 %}