diff --git a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 index 66760965..728c2861 100644 --- a/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/mrzcpd/templates/mrglobal.conf.j2.j2.7400MCN0P01R01 @@ -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 diff --git a/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01 b/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01 index 09cda689..59fbeb91 100644 --- a/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01 +++ b/ansible/roles/sapp/templates/vlan_flipping_map.conf.j2.j2.7400MCN0P01R01 @@ -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 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 06372c44..2a3f91d7 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 @@ -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