bugfix:修改引用olap大小写错误问题和修改7400环境下mcn0的mrzcpd配置文件

2021-06-23 18:35:01 +08:00
parent 81a2f9186e
commit a9350b2388
3 changed files with 5 additions and 5 deletions
--- 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"
--- 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 = [] %}
--- 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"