diff --git a/ansible/roles/firewall/templates/main.conf.j2.j2 b/ansible/roles/firewall/templates/main.conf.j2.j2 index 620882e0..c177570b 100644 --- a/ansible/roles/firewall/templates/main.conf.j2.j2 +++ b/ansible/roles/firewall/templates/main.conf.j2.j2 @@ -83,8 +83,8 @@ live_intervals_time = 30 [HOS_CONF] {% raw %} -hos_serverip="{{ OLAP.hos_server.address }}" -hos_serverport={{ OLAP.hos_server.port }} +hos_serverip="{{ olap.hos_server.address }}" +hos_serverport={{ olap.hos_server.port }} {% endraw %} hos_accesskeyid="default" hos_secretkey="default" diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 index 35667480..53373228 100644 --- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 @@ -8,7 +8,7 @@ sz_buffer=0 {% if npb_device == 'inline_device' %} in_addr={{inline_device_settings.keepalive.ip}} in_mask={{inline_device_settings.keepalive.mask}} -vlan-id-allow=1000,1001,4000,4001 +vlan-id-allow=4000,4001 {% endif %} {% if npb_device == 'tera' %} {% set mrzcpd_vlanid_allow_list = [] %} diff --git a/ansible/roles/mrzcpd/templates/mrzcpd.j2 b/ansible/roles/mrzcpd/templates/mrzcpd.j2 index f44b16b8..296bd37f 100644 --- a/ansible/roles/mrzcpd/templates/mrzcpd.j2 +++ b/ansible/roles/mrzcpd/templates/mrzcpd.j2 @@ -1,8 +1,8 @@ MRZCPD_ROOT=/opt/mrzcpd -{% if PROFILE_ID == '7400-MCN0-P01R01' or PROFILE_ID == '9000-NPB-P01R01' %} +{% if PROFILE_ID == '9000-NPB-P01R01' %} HUGEPAGE_NUM_2M=16384 {% endif %} -{% if PROFILE_ID == '7400-MCN123-P01R01' %} +{% if PROFILE_ID == '7400-MCN0-P01R01' or PROFILE_ID == '7400-MCN123-P01R01' %} HUGEPAGE_NUM_1G=32 {% endif %} DEFAULT_UIO_MODULE="vfio_pci" \ No newline at end of file