集成张智涵的部分修改。

2019-12-17 18:59:03 +08:00
parent 999349a445
commit 1f075039c5
15 changed files with 361 additions and 0 deletions
--- a/roles/mrzcpd/templates/mrglobal.conf.inline.j2
+++ b/roles/mrzcpd/templates/mrglobal.conf.inline.j2
@@ -16,10 +16,17 @@ gateway={{nic_data_incoming.gw}}
 jumbo_frame=1
 max_rx_pkt_len=15360
 clear_tx_flags=1
+{% if nic_data_incoming.ip is defined %}
+#vlan-filter=1
+#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
+{% else %}
 vlan-filter=1
 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
+{% endif %}

 [device:{{nic_to_tfe.tfe0.name}}]
 jumbo_frame=1