From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 0254063459 for ; Mon, 21 Sep 2020 18:51:25 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F1F332772A for ; Mon, 21 Sep 2020 18:51:24 +0200 (CEST) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id ECD8927705 for ; Mon, 21 Sep 2020 18:51:22 +0200 (CEST) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 81CA2D5268; Mon, 21 Sep 2020 18:51:16 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 21 Sep 2020 18:51:14 +0200 Message-Id: <20200921165115.2930386-3-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200921165115.2930386-1-aderumier@odiso.com> References: <20200921165115.2930386-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.928 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH ifupdown2 2/3] patch: allow vlan tag inside vxlan tunnel X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Sep 2020 16:51:25 -0000 Signed-off-by: Alexandre Derumier --- ...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 +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 +--- + 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