summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangzhihan <[email protected]>2020-05-08 10:59:24 +0800
committerzhangzhihan <[email protected]>2020-05-08 10:59:24 +0800
commit86c3968c83304067c23737fa50bfa599978c3d34 (patch)
treeae088291467c4566151d55c8463273d910fadfb3
parent324fe13b055761a64df5791c4f287bfde510a4ad (diff)
修改mrglobal.conf vlan filter配置tsg-version20.4.01-deploy
-rw-r--r--roles/mrzcpd/templates/mrglobal.conf.allot_access.j22
-rw-r--r--roles/mrzcpd/templates/mrglobal.conf.inline.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/mrzcpd/templates/mrglobal.conf.allot_access.j2 b/roles/mrzcpd/templates/mrglobal.conf.allot_access.j2
index a4ab0ad..d0ba56e 100644
--- a/roles/mrzcpd/templates/mrglobal.conf.allot_access.j2
+++ b/roles/mrzcpd/templates/mrglobal.conf.allot_access.j2
@@ -7,7 +7,7 @@ sz_buffer=0
jumbo_frame=1
max_rx_pkt_len=15360
clear_tx_flags=1
-vlan-filter=0
+vlan-filter=1
vlan-id-allow={{ AllotAccess.virturlID_1 }},{{ AllotAccess.virturlID_2 }}
vlan-pvid=0
vlan-pvid-mode=2
diff --git a/roles/mrzcpd/templates/mrglobal.conf.inline.j2 b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
index 10bbd5f..5d5862b 100644
--- a/roles/mrzcpd/templates/mrglobal.conf.inline.j2
+++ b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
@@ -22,7 +22,7 @@ clear_tx_flags=1
#vlan-pvid=0
#vlan-pvid-mode=0
{% else %}
-vlan-filter=1
+vlan-filter=0
vlan-id-allow=3811,3812,3813,3814,3821,3822,3823,3824,3831,3832,3833,3834,3841,3842,3843,3844
vlan-pvid=0
vlan-pvid-mode=0