Package: release.debian.org Severity: normal Tags: buster User: release.debian....@packages.debian.org Usertags: pu
Hi, Please allow me to fixup OVS's missing python3-six dependency, and add support for fixing the MTU of OVS devices. The attached patch is quite minimalistic. This also adds a bit of doc on how to set things up in /etc/network/interfaces. Cheers, Thomas Goirand (zigo)
diff -Nru openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/changelog openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/changelog --- openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/changelog 2019-04-14 00:25:19.000000000 +0200 +++ openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/changelog 2019-06-24 08:53:33.000000000 +0200 @@ -1,3 +1,11 @@ +openvswitch (2.10.0+2018.08.28+git.8ca7c82b7d+ds1-13) buster; urgency=medium + + * Some fixups in debian/ifupdown.sh to allow setting-up the MTU. + * Document how to do Bond + Bridge + VLAN + MTU. + * Correct dependency on python3-six instead of python-six (Closes: #931104). + + -- Thomas Goirand <z...@debian.org> Mon, 24 Jun 2019 08:53:33 +0200 + openvswitch (2.10.0+2018.08.28+git.8ca7c82b7d+ds1-12) unstable; urgency=medium * Add --may-exist in debian/ifupdown.sh as per upstream commit. Without it, @@ -7,6 +15,18 @@ openvswitch (2.10.0+2018.08.28+git.8ca7c82b7d+ds1-11) unstable; urgency=medium + * Removes network.service from openvswitch-switch.service to avoid a + dependency loop in systemd, leading to removal of networking.service. + Also use "ip link set DEVNAME up" instead of ifconfig, and runtime + depend on iproute2. + Thanks to Benjamin Drung for the bug report (Closes: #924562) and to + Jonathan Dupart for the patch as a merge request in Salsa. + + -- Thomas Goirand <z...@debian.org> Sun, 31 Mar 2019 00:50:26 +0100 +>>>>>>> debian/stein + +openvswitch (2.10.0+2018.08.28+git.8ca7c82b7d+ds1-11) unstable; urgency=medium + * Removes network.service from openvswitch-switch.service to avoid a dependency loop in systemd, leading to removal of networking.service. Also use "ip link set DEVNAME up" instead of ifconfig, and runtime diff -Nru openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/control openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/control --- openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/control 2019-04-14 00:25:19.000000000 +0200 +++ openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/control 2019-06-24 08:53:33.000000000 +0200 @@ -41,9 +41,9 @@ Depends: iproute2, openssl, - python-six, + python3-six, ${misc:Depends}, - ${python:Depends}, + ${python3:Depends}, ${shlibs:Depends}, Suggests: ethtool, diff -Nru openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/ifupdown.sh openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/ifupdown.sh --- openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/ifupdown.sh 2019-04-14 00:25:19.000000000 +0200 +++ openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/ifupdown.sh 2019-06-24 08:53:33.000000000 +0200 @@ -67,7 +67,7 @@ ip link set "${IFACE}" up ;; OVSBond) - ovs_vsctl -- --fake-iface --may-exist add-bond "${IF_OVS_BRIDGE}"\ + ovs_vsctl -- --may-exist --fake-iface add-bond "${IF_OVS_BRIDGE}"\ "${IFACE}" ${IF_OVS_BONDS} ${IF_OVS_OPTIONS} \ ${OVS_EXTRA+-- $OVS_EXTRA} @@ -93,6 +93,9 @@ exit 0 ;; esac + if [ -n "${IF_OVS_MTU}" ] ; then + ovs-vsctl set Interface ${IFACE} mtu_request=${IF_OVS_MTU} + fi elif [ "${MODE}" = "stop" ]; then case "${IF_OVS_TYPE}" in OVSBridge) diff -Nru openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/openvswitch-switch.README.Debian openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/openvswitch-switch.README.Debian --- openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/openvswitch-switch.README.Debian 2019-04-14 00:25:19.000000000 +0200 +++ openvswitch-2.10.0+2018.08.28+git.8ca7c82b7d+ds1/debian/openvswitch-switch.README.Debian 2019-06-24 08:53:33.000000000 +0200 @@ -163,6 +163,59 @@ ifup --allow=ovs $list_of_bridges ifdown --allow=ovs $list_of_bridges +ex 9: Bond + Bridge + VLAN + MTU + +allow-bond0 eth2 +iface eth2 inet manual + ovs_type OVSPort + ovs_bonds bond0 + ovs_mtu 9000 + +# Interface eth3 +#auto eth3 +allow-bond0 eth3 +iface eth3 inet manual + ovs_type OVSPort + ovs_bonds bond0 + ovs_mtu 9000 + +# Interface bond0 +auto bond0 +allow-br-ex bond0 +iface bond0 inet manual + ovs_bridge br-ex + ovs_type OVSBond + ovs_bonds eth2 eth3 + ovs_options bond_mode=balance-tcp lacp=active other_config:lacp-time=fast + ovs_mtu 9000 + up ifup eth2 + up ifup eth3 + up ovs-vsctl set Interface ${IFACE} mtu_request=${IF_OVS_MTU} + +# Interface vlan81 +auto vlan871 +allow-br-ex vlan81 +iface vlan81 inet static + ovs_type OVSIntPort + ovs_bridge br-ex + ovs_options tag=81 + ovs_extra set interface ${IFACE} external-ids:iface-id=$(hostname -s)-${IFACE}-vif + ovs_mtu 9000 + address 192.168.100.2 + network 192.168.100.0 + netmask 255.255.255.0 + broadcast 192.168.100.255 + gateway 192.168.100.1 + +# Interface br-ex +auto br-ex +allow-ovs br-ex +iface br-ex inet manual + ovs_type OVSBridge + ovs_ports bond0 vlan81 + ovs_mtu 9000 + + Notes on dependencies: ---------------------