diff options
| -rw-r--r-- | main/openvswitch/APKBUILD | 8 | ||||
| -rw-r--r-- | main/openvswitch/readme.debian.patch | 86 |
2 files changed, 49 insertions, 45 deletions
diff --git a/main/openvswitch/APKBUILD b/main/openvswitch/APKBUILD index f68cba6895..6e6151a835 100644 --- a/main/openvswitch/APKBUILD +++ b/main/openvswitch/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=openvswitch -pkgver=2.9.2 -pkgrel=1 +pkgver=2.10.1 +pkgrel=0 pkgdesc="A production quality, multilayer virtual switch" url="http://openvswitch.org/" arch="all" @@ -159,7 +159,7 @@ _ovn() { usr/bin/ovn-docker-overlay-driver } -sha512sums="6122651fcdeb64793ae7cdd379f55f87ff1f989d6cb5ab67ad83125c566508b474e1875f024d2f2fc2159b90baf383d5e792cbf515a96266126f0f05511ceb0d openvswitch-2.9.2.tar.gz +sha512sums="3634bd3e978110cb9e11191a88e4232a7af152a6ddf46e8a32e50e07de866be782b7e753d26b81183ec107816e5af4109badf8f2067a61fd9506ccf81e748e44 openvswitch-2.10.1.tar.gz 097d4721a78fff749c534910d98543778474406bd61b469b88a0d981a2a380556444437ec44278cead6d8688c45a38b2acbf1551acb9ab38d048f413728e3b88 ovsdb-server.initd b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 ovsdb-server.confd 4bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd @@ -167,4 +167,4 @@ b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7 1e08aa5ac6ce55b97256478b9243c8a4c92a42a97fc70ea0439c832b12a775af28a127224ae6c4ce01642dde65f76c610a44105912338bf443d8ea390c2d9ccf ovs-modules.initd c5f137bce28bf80c1e5a6ca18722dae9a5ecff03d20bf92642270951bbbb499e5fb05a08163442720e866d135fcd7426b88add0b42ed240d5f0c068aa9fcd9da musl-if_packet.patch eca5b19954e6df7dc17c582e22e4b27533710d077039a54a2ba291ae7d3a2706872f5bcad8795ca58e06ca7e45a9b8c4c51e99aedbabd0e87623972ebcdca230 ifupdown-alpine.patch -2874bc7b4552c21d21e06f73c63ac5cf72d7db5252b51a0ac17b58e8cd536453c15e494c59b432aacba03be5cc309a4074ccdac11420a1613c22aa3fe07def7f readme.debian.patch" +f006e7a849132140e1c6312810e7b897421dff0cc6661d4f0590a117c0a85da1fef2feca3339758f94b7732445d6d617b12744a23939fcb8ebe85884d3134d9e readme.debian.patch" diff --git a/main/openvswitch/readme.debian.patch b/main/openvswitch/readme.debian.patch index e641e70914..af89a0d355 100644 --- a/main/openvswitch/readme.debian.patch +++ b/main/openvswitch/readme.debian.patch @@ -9,36 +9,36 @@ -In order of increasing manual effort, these are: - - * Use a Linux kernel 3.3 or later, which has an integrated Open -- vSwitch kernel module. +- vSwitch kernel module. - -- The upstream Linux kernel module lacks a few features that -- are in the third-party module. For details, please see the -- FAQ, "What features are not available in the Open vSwitch -- kernel datapath that ships as part of the upstream Linux -- kernel?". +- The upstream Linux kernel module lacks a few features that +- are in the third-party module. For details, please see the +- FAQ, "What features are not available in the Open vSwitch +- kernel datapath that ships as part of the upstream Linux +- kernel?". - - * Install the "openvswitch-datapath-dkms" Debian package that -- you built earlier. This should automatically build and -- install the Open vSwitch kernel module for your running -- kernel. +- you built earlier. This should automatically build and +- install the Open vSwitch kernel module for your running +- kernel. - -- This option requires that you have a compiler and toolchain -- installed on the machine where you run Open vSwitch, which -- may be unacceptable in some production server environments. +- This option requires that you have a compiler and toolchain +- installed on the machine where you run Open vSwitch, which +- may be unacceptable in some production server environments. - - * Install the "openvswitch-datapath-source" Debian package, use -- "module-assistant" to build a Debian package of the Open -- vSwitch kernel module for your kernel, and then install that -- Debian package. +- "module-assistant" to build a Debian package of the Open +- vSwitch kernel module for your kernel, and then install that +- Debian package. - -- You can install the kernel module Debian packages that you -- build this way on the same machine where you built it or on -- another machine or machines, which means that you don't -- necessarily have to have any build infrastructure on the -- machines where you use the kernel module. +- You can install the kernel module Debian packages that you +- build this way on the same machine where you built it or on +- another machine or machines, which means that you don't +- necessarily have to have any build infrastructure on the +- machines where you use the kernel module. - -- /usr/share/doc/openvswitch-datapath-source/README.Debian has -- details on the build process. +- /usr/share/doc/openvswitch-datapath-source/README.Debian has +- details on the build process. - - * Build and install the kernel module by hand. - @@ -62,16 +62,31 @@ -ifdown --allow=ovs $list_of_bridges +ifup $list_of_bridges +ifdown $list_of_bridges ++ ++Notes on LXC integration: ++------------------------- ++ ++To prevent containers failing to start after hard reboots create: ++----------------------------------------------------------------- ++ ++/etc/lxc/ovsup: ++ ++#!/bin/sh ++ovs-vsctl --if-exists del-port $5 ++----------------------------------------------------------------- ++ ++/etc/lxc/ovsdown: ++ ++#!/bin/sh -Notes on dependencies: ---------------------- -+Notes on LXC integration: -+------------------------- ++ovs-vsctl --if-exists del-port veth.$LXC_NAME ++----------------------------------------------------------------- -openvswitch-switch depends on $network, $named $remote_fs and $syslog to start. -This creates some startup dependency issues. -+To prevent containers failing to start after hard reboots create: -+----------------------------------------------------------------- ++& add to the container config file: -* Since openvswitch utilities are placed in /usr and /usr can be mounted -through NFS, openvswitch has to start after it. But if a user uses openvswitch @@ -79,28 +94,22 @@ -So, if /usr is mounted through NFS and openvswitch is used for all networking, -the administrator should figure out a way to mount NFS before starting OVS. -One way to do this is in initramfs. -+/etc/lxc/ovsup: - +- -* Since openvswitch starts after $network, $remote_fs and $syslog, any startup -script that depends on openvswitch but starts before it, needs to be changed -to depend on openvswitch-switch too. -+#!/bin/sh -+ovs-vsctl --if-exists del-port $5 -+----------------------------------------------------------------- - +- -* Ideally, an admin should not add openvswitch bridges in the 'auto' -section of the 'interfaces' file (i.e., if "br0" is a OVS bridge, you should -not have a line "auto br0"). This is because, when ifupdown starts -working on bridges listed in 'auto', openvswitch has not yet started. -+/etc/lxc/ovsdown: - +- -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 -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. -+#!/bin/sh - +- -* With systemd, adding openvswitch bridges in the 'auto' section of the -'interfaces' file can cause race conditions (i.e., if "br0" is a OVS bridge, -you should not have a line "auto br0"). Debian systems have added a @@ -110,10 +119,5 @@ -bridges using tools like "ovs-vsctl" or "ovs-dpctl". This is also a problem -when you upgrade your openvswitch kernel module using commands like -'force-reload-kmod'. -+ovs-vsctl --if-exists del-port veth.$LXC_NAME -+----------------------------------------------------------------- -+ -+& add to the container config file: -+ +lxc.hook.pre-start = /etc/lxc/ovsup +lxc.hook.post-stop = /etc/lxc/ovsdown |