Signed-off-by: Alexandre Derumier <[email protected]> --- ...9-allow-vlan-tag-inside-vxlan-tunnel.patch | 31 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 32 insertions(+) create mode 100644 debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch
diff --git a/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch b/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch new file mode 100644 index 0000000..7d0cecd --- /dev/null +++ b/debian/patches/pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch @@ -0,0 +1,31 @@ +From a53022b71d98abf1cc34bf380309853fbb18b443 Mon Sep 17 00:00:00 2001 +From: Alexandre Derumier <[email protected]> +Date: Mon, 21 Sep 2020 08:47:25 +0200 +Subject: [PATCH] allow vlan tag inside vxlan tunnel + +Cumulus forbid it, but it's totally valid. + +Signed-off-by: Alexandre Derumier <[email protected]> +--- + ifupdown2/addons/bridge.py | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py +index 2b9ea84..b835ac2 100644 +--- a/ifupdown2/addons/bridge.py ++++ b/ifupdown2/addons/bridge.py +@@ -1557,11 +1557,6 @@ class bridge(Addon, moduleBase): + because kernel does honor vid info flags during deletes. + + """ +- if not isbridge and (bportifaceobj.link_kind & ifaceLinkKind.VXLAN and not bportifaceobj.link_privflags & ifaceLinkPrivFlags.SINGLE_VXLAN): +- if not vids or not pvid or len(vids) > 1 or vids[0] != pvid: +- self._error_vxlan_in_vlan_aware_br(bportifaceobj, +- bportifaceobj.upperifaces[0]) +- return + + vids_int = self._ranges_to_ints(vids) + try: +-- +2.20.1 + diff --git a/debian/patches/series b/debian/patches/series index a83e94e..1bea610 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,4 +6,5 @@ pve/0005-ifreload-down-up-vxlan-interfaces-when-ifreload_down.patch pve/0006-config-tuning.patch pve/0007-networking.service-fix-dependencies-and-ordering.patch pve/0008-openvswitch-ovs-ports-condone-regex-exclude-tap-veth.patch +pve/0009-allow-vlan-tag-inside-vxlan-tunnel.patch pve/0010-postinst-rm-update-network-config-compatibility.patch -- 2.20.1 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
