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

7400 adapt:在NPB是tera的情况下vlan_flipping_map.conf中的vlan ID信息读取配置文件

Browse Source
This commit is contained in:
fumingwei
2021-06-21 11:17:47 +08:00
parent 5997a3d3d2
commit bc63f96c5b
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01
View File

@@ -11,7 +11,12 @@ in_mask={{inline_device_config.keepalive_mask}}
vlan-id-allow=1000,1001,4000,4001
{% endif %}
{% if NPB_device == 'tera' %}
vlan-id-allow= {{ access_vlan_id_list | join(",") }},4000,4001
{% set mrzcpd_vlanid_allow_list = [] %}
{% for vlan_info in vlan_flipping %}
{{ mrzcpd_vlanid_allow_list.append(vlan_info.C_router_vlan_id) }}
{{ mrzcpd_vlanid_allow_list.append(vlan_info.I_router_vlan_id) }}
{% endfor %}
vlan-id-allow= {{ mrzcpd_vlanid_allow_list | join(",") }},4000,4001
{% endif %}
{% endraw %}
jumbo_frame=1

5
ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01
View File

@@ -8,8 +8,9 @@
#C_router_vlan_id I_router_vlan_id mac_flipping_enable
{% raw %}
{% if NPB_device == 'tera' %}
1301 1302 1
1201 1202 1
{% for vlan_info in vlan_flipping %}
{{ vlan_info.C_router_vlan_id }} {{ vlan_info.I_router_vlan_id }} 1
{% endfor %}
{% endif %}
{% endraw %}
4000 4001 0

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

@@ -43,6 +43,12 @@ access_vlan_id_list:
- 1000
- 1001
vlan_flipping:
- C_router_vlan_id: 1301
I_router_vlan_id: 1302
- C_router_vlan_id: 1201
I_router_vlan_id: 1202
keep_alive: 127.0.0.1