diff --git a/debian/README.Debian b/debian/README.Debian index cf0b9f0572ac8bf8712d962df1f15ff641e3d38a..4671f4ae2d2ba85678afe673900e314ea7c4821f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -2,24 +2,24 @@ Here's an example configuration for your /etc/network/interfaces using a simple ovsbr0 bridge for eth0, with dhcp for ipv4 and ipv6. This was taken from https://bugs.debian.org/860786. -allow-ovs ovsbr0 +auto ovsbr0 iface ovsbr0 inet dhcp ovs_type OVSBridge ovs_ports eth0 -allow-ovs ovsbr0 +auto ovsbr0 iface ovsbr0 inet6 dhcp ovs_type OVSBridge ovs_ports eth0 -allow-ovsbr0 eth0 +autobr0 eth0 iface eth0 inet manual ovs_bridge ovsbr0 ovs_type OVSPort However, this didn't work for me. Instead, this worked: -allow-ovs br0 +auto br0 iface br0 inet dhcp ovs_type OVSBridge ovs_port enp0s3 @@ -33,4 +33,4 @@ iface enp0s3 inet manual up dhclient br0 down ip link set enp0s3 down - -- Thomas Goirand Mon, 29 Jan 2018 11:33:40 +0100 + -- Antoine Beaupré , Wed, 22 Jun 2022 12:02:39 -0400 diff --git a/debian/openvswitch-switch.README.Debian b/debian/openvswitch-switch.README.Debian index 2bd6681a6e168a1aed00198fbceb32054278b9fe..c187ac466e3102152cbc81be7132ac11f6d77259 100644 --- a/debian/openvswitch-switch.README.Debian +++ b/debian/openvswitch-switch.README.Debian @@ -4,13 +4,15 @@ This package lets a user to optionally configure Open vSwitch bridges and ports from /etc/network/interfaces. Please refer to the interfaces(5) manpage for more details regarding /etc/network/interfaces. -The stanzas that configure the OVS bridges should begin with "allow-ovs" +The stanzas that configure the OVS bridges should begin with "auto" followed by name of the bridge. Here is an example. -allow-ovs br0 + + auto br0 The stanzas that configure the OVS ports should begin with -"allow-${bridge-name}" followed by name of the port. Here is an example. -allow-br0 eth0 +"allow-${bridge-name}" followed by name of the port. Here is an example: + + allow-br0 eth0 The following OVS specific "command" options are supported: @@ -51,7 +53,7 @@ Examples: -------- ex 1: A standalone bridge. -allow-ovs br0 +auto br0 iface br0 inet static address 192.168.1.1 netmask 255.255.255.0 @@ -59,7 +61,7 @@ iface br0 inet static ex 2: A bridge with one port. -allow-ovs br0 +auto br0 iface br0 inet dhcp ovs_type OVSBridge ovs_ports eth0 @@ -71,7 +73,7 @@ iface eth0 inet manual ex 3: A bridge with multiple physical ports. -allow-ovs br0 +auto br0 iface br0 inet dhcp ovs_type OVSBridge ovs_ports eth0 eth1 @@ -88,7 +90,7 @@ iface eth1 inet manual ex 4: A bridge with an OVS internal port. -allow-ovs br1 +auto br1 iface br1 inet static address 192.168.1.1 netmask 255.255.255.0 @@ -104,7 +106,7 @@ iface vlan100 inet manual ex 5: Bonding. -allow-ovs br2 +auto br2 iface br2 inet static address 192.170.1.1 netmask 255.255.255.0 @@ -120,7 +122,7 @@ iface bond0 inet manual ex 6: Patch ports. -allow-ovs br0 +auto br0 iface br0 inet manual ovs_type OVSBridge ovs_ports patch0 @@ -131,7 +133,7 @@ iface patch0 inet manual ovs_type OVSPatchPort ovs_patch_peer patch1 -allow-ovs br1 +auto br1 iface br1 inet manual ovs_type OVSBridge ovs_ports patch1 @@ -144,7 +146,7 @@ iface patch1 inet manual ex 7: Tunnel. -allow-ovs br1 +auto br1 iface br1 inet static address 192.168.1.1 netmask 255.255.255.0 @@ -209,7 +211,6 @@ iface vlan81 inet static # Interface br-ex auto br-ex -allow-ovs br-ex iface br-ex inet manual ovs_type OVSBridge ovs_ports bond0 vlan81 @@ -234,8 +235,10 @@ script that depends on openvswitch but starts before it, needs to be changed to depend on openvswitch-switch too. * Ideally, an admin should not add openvswitch bridges in the 'auto' -section of the 'interfaces' file. This is because, when ifupdown starts -working on bridges listed in 'auto', openvswitch has not yet started. +section of the 'interfaces' file. This is because, when ifupdown +starts working on bridges listed in 'auto', openvswitch has not yet +started. This guide previously advised to use 'allow-ovs' instead, but +this has started failing after the bullseye upgrade, see bug #989720. But, if the admin wants to go down this route and adds openvswitch bridges in the 'auto' section, openvswitch-switch will forcefully be started when @@ -243,4 +246,4 @@ ifupdown kicks in. In a case like this, the admin needs to make sure that /usr has already been mounted and that a remote $syslog (if used) is ready to receive openvswitch logs. - -- Ben Pfaff , Fri, 23 Dec 2016 09:45:56 -0800 + -- Antoine Beaupré , Wed, 22 Jun 2022 12:00:21 -0400