From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <f.gruenbichler@proxmox.com> 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 465E26022D for <pve-devel@pve.proxmox.com>; Tue, 11 Aug 2020 15:34:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 44AA58428 for <pve-devel@pve.proxmox.com>; Tue, 11 Aug 2020 15:33:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 03817841C for <pve-devel@pve.proxmox.com>; Tue, 11 Aug 2020 15:33:50 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BB1EB44596 for <pve-devel@pve.proxmox.com>; Tue, 11 Aug 2020 15:33:49 +0200 (CEST) Date: Tue, 11 Aug 2020 15:33:43 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= <f.gruenbichler@proxmox.com> To: PVE development discussion <pve-devel@pve.proxmox.com> References: <20200513144654.31184-1-a.lauterer@proxmox.com> In-Reply-To: <20200513144654.31184-1-a.lauterer@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.15.0 (https://github.com/astroidmail/astroid) Message-Id: <1597152815.2ayc6cublg.astroid@nora.none> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-SPAM-LEVEL: Spam detection results: 0 AWL 0.037 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com] Subject: [pve-devel] applied-series: [PATCH docs 1/2] fix #2526: network config: change underscore to dash X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Tue, 11 Aug 2020 13:34:21 -0000 On May 13, 2020 4:46 pm, Aaron Lauterer wrote: > The network config examples use the underscore but our tooling > generates the configs with dashes. >=20 > Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com> > --- >=20 > pve-network.adoc | 80 ++++++++++++++++++++++++------------------------ > pvecm.adoc | 6 ++-- > 2 files changed, 43 insertions(+), 43 deletions(-) >=20 > diff --git a/pve-network.adoc b/pve-network.adoc > index 8f3af0d..1c5ae17 100644 > --- a/pve-network.adoc > +++ b/pve-network.adoc > @@ -161,9 +161,9 @@ iface vmbr0 inet static > address 192.168.10.2 > netmask 255.255.255.0 > gateway 192.168.10.1 > - bridge_ports eno1 > - bridge_stp off > - bridge_fd 0 > + bridge-ports eno1 > + bridge-stp off > + bridge-fd 0 > ---- > =20 > Virtual machines behave as if they were directly connected to the > @@ -209,9 +209,9 @@ auto vmbr0 > iface vmbr0 inet static > address 203.0.113.17 > netmask 255.255.255.248 > - bridge_ports none > - bridge_stp off > - bridge_fd 0 > + bridge-ports none > + bridge-stp off > + bridge-fd 0 > ---- > =20 > =20 > @@ -239,9 +239,9 @@ auto vmbr0 > iface vmbr0 inet static > address 10.10.10.1 > netmask 255.255.255.0 > - bridge_ports none > - bridge_stp off > - bridge_fd 0 > + bridge-ports none > + bridge-stp off > + bridge-fd 0 > =20 > post-up echo 1 > /proc/sys/net/ipv4/ip_forward > post-up iptables -t nat -A POSTROUTING -s '10.10.10.0/24' -o e= no1 -j MASQUERADE > @@ -357,18 +357,18 @@ iface bond0 inet static > slaves eno1 eno2 > address 192.168.1.2 > netmask 255.255.255.0 > - bond_miimon 100 > - bond_mode 802.3ad > - bond_xmit_hash_policy layer2+3 > + bond-miimon 100 > + bond-mode 802.3ad > + bond-xmit-hash-policy layer2+3 > =20 > auto vmbr0 > iface vmbr0 inet static > address 10.10.10.2 > netmask 255.255.255.0 > gateway 10.10.10.1 > - bridge_ports eno1 > - bridge_stp off > - bridge_fd 0 > + bridge-ports eno1 > + bridge-stp off > + bridge-fd 0 > =20 > ---- > =20 > @@ -389,18 +389,18 @@ iface eno2 inet manual > auto bond0 > iface bond0 inet manual > slaves eno1 eno2 > - bond_miimon 100 > - bond_mode 802.3ad > - bond_xmit_hash_policy layer2+3 > + bond-miimon 100 > + bond-mode 802.3ad > + bond-xmit-hash-policy layer2+3 > =20 > auto vmbr0 > iface vmbr0 inet static > address 10.10.10.2 > netmask 255.255.255.0 > gateway 10.10.10.1 > - bridge_ports bond0 > - bridge_stp off > - bridge_fd 0 > + bridge-ports bond0 > + bridge-stp off > + bridge-fd 0 > =20 > ---- > =20 > @@ -474,15 +474,15 @@ iface vmbr0v5 inet static > address 10.10.10.2 > netmask 255.255.255.0 > gateway 10.10.10.1 > - bridge_ports eno1.5 > - bridge_stp off > - bridge_fd 0 > + bridge-ports eno1.5 > + bridge-stp off > + bridge-fd 0 > =20 > auto vmbr0 > iface vmbr0 inet manual > - bridge_ports eno1 > - bridge_stp off > - bridge_fd 0 > + bridge-ports eno1 > + bridge-stp off > + bridge-fd 0 > =20 > ---- > =20 > @@ -502,10 +502,10 @@ iface vmbr0.5 inet static > =20 > auto vmbr0 > iface vmbr0 inet manual > - bridge_ports eno1 > - bridge_stp off > - bridge_fd 0 > - bridge_vlan_aware yes > + bridge-ports eno1 > + bridge-stp off > + bridge-fd 0 > + bridge-vlan-aware yes > ---- > =20 > The next example is the same setup but a bond is used to > @@ -523,9 +523,9 @@ iface eno2 inet manual > auto bond0 > iface bond0 inet manual > slaves eno1 eno2 > - bond_miimon 100 > - bond_mode 802.3ad > - bond_xmit_hash_policy layer2+3 > + bond-miimon 100 > + bond-mode 802.3ad > + bond-xmit-hash-policy layer2+3 > =20 > iface bond0.5 inet manual > =20 > @@ -534,15 +534,15 @@ iface vmbr0v5 inet static > address 10.10.10.2 > netmask 255.255.255.0 > gateway 10.10.10.1 > - bridge_ports bond0.5 > - bridge_stp off > - bridge_fd 0 > + bridge-ports bond0.5 > + bridge-stp off > + bridge-fd 0 > =20 > auto vmbr0 > iface vmbr0 inet manual > - bridge_ports bond0 > - bridge_stp off > - bridge_fd 0 > + bridge-ports bond0 > + bridge-stp off > + bridge-fd 0 > =20 > ---- > =20 > diff --git a/pvecm.adoc b/pvecm.adoc > index 4bf2f59..2866582 100644 > --- a/pvecm.adoc > +++ b/pvecm.adoc > @@ -1256,9 +1256,9 @@ iface vmbr0 inet static > address 192.X.Y.57 > netmask 255.255.250.0 > gateway 192.X.Y.1 > - bridge_ports eno1 > - bridge_stp off > - bridge_fd 0 > + bridge-ports eno1 > + bridge-stp off > + bridge-fd 0 > =20 > # cluster network > auto eno2 > --=20 > 2.20.1 >=20 >=20 > _______________________________________________ > pve-devel mailing list > pve-devel@pve.proxmox.com > https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel >=20 >=20 =