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

refactor:将vlan_flipping的内容加入到zone_group_list中

Browse Source
This commit is contained in:
fumingwei
2021-06-22 16:36:06 +08:00
parent a1d9cc718a
commit 55a767b7de
3 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,9 +12,9 @@ vlan-id-allow=1000,1001,4000,4001
{% endif %}
{% if NPB_device == 'tera' %}
{% 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) }}
{% for zone_group in zone_group_list %}
{{ mrzcpd_vlanid_allow_list.append(zone_group.internal.vlan_id) }}
{{ mrzcpd_vlanid_allow_list.append(zone_group.external.vlan_id) }}
{% endfor %}
vlan-id-allow={{ mrzcpd_vlanid_allow_list | join(",") }},4000,4001
{% endif %}

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

@@ -8,8 +8,8 @@
#C_router_vlan_id I_router_vlan_id mac_flipping_enable
{% raw %}
{% if NPB_device == 'tera' %}
{% for vlan_info in vlan_flipping %}
{{ vlan_info.C_router_vlan_id }} {{ vlan_info.I_router_vlan_id }} 1
{% for zone_group in zone_group_list %}
{{ zone_group.zone_group.internal.vlan_id }} {{ zone_group.external.vlan_id }} 1
{% endfor %}
{% if NPB_device == 'direct' %}
1000 1001 0

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

@@ -38,12 +38,27 @@ cache:
# NPB_device value in [inline_device, tera,direct]
NPB_device: inline_device
vlan_flipping:
- C_router_vlan_id: 1301
I_router_vlan_id: 1302
- C_router_vlan_id: 1201
I_router_vlan_id: 1202
zone_group_list:
- internal:
vlan_id: 1301
tracking_ip:
ipv4: 127.0.0.1
ipv6: '\:\:1'
external:
vlan_id: 1302
tracking_ip:
ipv4: 127.0.0.1
ipv6: '\:\:1'
- internal:
vlan_id: 1201
tracking_ip:
ipv4: 127.0.0.1
ipv6: '\:\:1'
external:
vlan_id: 1202
tracking_ip:
ipv4: 127.0.0.1
ipv6: '\:\:1'
keep_alive: 127.0.0.1