add patch 0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch

https://github.com/CumulusNetworks/ifupdown2/pull/166

Openvswitch already manage mtu if ovs-mtu is defined.
(Ovs manage mtu in userland, and sync mtu for some interfaces in kernel).

If mtu is changed by address module, before the ovs userland mtu,
this give packets drop.

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/debian/changelog b/debian/changelog
index c5b2f2a2dea65d22e89897f25d5ee24f7e99eb74..b9fdfc15a1af06a365ba6691b67ffea7c25e6093 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ifupdown2 (3.0.0-1+pve2) pve; urgency=medium
+
+  * OVS already manages the MTU if 'ovs-mtu' is defined, mind that.
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 05 Jun 2020 08:31:14 +0200
+
 ifupdown2 (3.0.0-1+pve1) pve; urgency=medium
 
   * update to new 3.0.0 upstream release

diff --git a/debian/patches/pve/0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch b/debian/patches/pve/0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch
new file mode 100644 (file)
index 0000000..d12a6ed
--- /dev/null
+++ b/debian/patches/pve/0009-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch
@@ -0,0 +1,32 @@
+From 54dbee161aa2fd281046386c10123222b790ebfc Mon Sep 17 00:00:00 2001
+From: Alexandre Derumier <aderumier@odiso.com>
+Date: Wed, 3 Jun 2020 13:06:14 +0200
+Subject: [PATCH] address: don't process_mtu if ovs-mtu is defined
+
+Openvswitch already manage mtu if ovs-mtu is defined.
+(Ovs manage mtu in userland, and sync mtu for some interfaces in kernel).
+
+Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
+---
+ ifupdown2/addons/address.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
+index 6578ebb..9a20c9e 100644
+--- a/ifupdown2/addons/address.py
++++ b/ifupdown2/addons/address.py
+@@ -881,6 +881,11 @@ class address(Addon, moduleBase):
+ 
+     def process_mtu(self, ifaceobj, ifaceobj_getfunc):
+         mtu_str = ifaceobj.get_attr_value_first('mtu')
++
++        ovs_mtu = ifaceobj.get_attr_value_first('ovs-mtu')
++        if ovs_mtu:
++            return
++
+         mtu_from_policy = False
+ 
+         if not mtu_str:
+-- 
+2.20.1
+

diff --git a/debian/patches/series b/debian/patches/series
index a83e94e5d6958c9f9d23b0e8556f569887556ef4..b454408d820d8f64d9af2b0351498efea9837947 100644 (file)
--- 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-address-don-t-process_mtu-if-ovs-mtu-is-defined.patch
 pve/0010-postinst-rm-update-network-config-compatibility.patch