1 From a53022b71d98abf1cc34bf380309853fbb18b443 Mon Sep 17 00:00:00 2001
2 From: Alexandre Derumier <aderumier@odiso.com>
3 Date: Mon, 21 Sep 2020 08:47:25 +0200
4 Subject: [PATCH] allow vlan tag inside vxlan tunnel
6 Cumulus forbid it, but it's totally valid.
8 Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
10 ifupdown2/addons/bridge.py | 5 -----
11 1 file changed, 5 deletions(-)
13 diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
14 index 2b9ea84..b835ac2 100644
15 --- a/ifupdown2/addons/bridge.py
16 +++ b/ifupdown2/addons/bridge.py
17 @@ -1557,11 +1557,6 @@ class bridge(Addon, moduleBase):
18 because kernel does honor vid info flags during deletes.
21 - if not isbridge and (bportifaceobj.link_kind & ifaceLinkKind.VXLAN and not bportifaceobj.link_privflags & ifaceLinkPrivFlags.SINGLE_VXLAN):
22 - if not vids or not pvid or len(vids) > 1 or vids[0] != pvid:
23 - self._error_vxlan_in_vlan_aware_br(bportifaceobj,
24 - bportifaceobj.upperifaces[0])
27 vids_int = self._ranges_to_ints(vids)