From 755c13e77cfc428872bf7b81721593c7a13be871 Mon Sep 17 00:00:00 2001 From: Flavio Leitner Date: Tue, 13 May 2014 15:00:45 -0300 Subject: [PATCH] Updated to 2.1.2 Resolves: #1092959 --- .gitignore | 1 + ...t-bring-up-internal-ports-by-default.patch | 20 ++--- ...able-DHCP-support-for-internal-ports.patch | 90 ------------------- openvswitch.spec | 7 +- sources | 2 +- 5 files changed, 13 insertions(+), 107 deletions(-) delete mode 100644 openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch diff --git a/.gitignore b/.gitignore index 5e26750..8b77aa5 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /openvswitch-2.0.0.tar.gz /openvswitch-2.0.1.tar.gz /openvswitch-2.1.0.tar.gz +/openvswitch-2.1.2.tar.gz diff --git a/openvswitch-bridge-don-t-bring-up-internal-ports-by-default.patch b/openvswitch-bridge-don-t-bring-up-internal-ports-by-default.patch index f72667d..11b08db 100644 --- a/openvswitch-bridge-don-t-bring-up-internal-ports-by-default.patch +++ b/openvswitch-bridge-don-t-bring-up-internal-ports-by-default.patch @@ -1,7 +1,4 @@ -From fab3da1fc7a88dfbe2275fa0eccb798444eae385 Mon Sep 17 00:00:00 2001 -From: Flavio Leitner -Date: Tue, 1 Apr 2014 18:05:20 -0300 -Subject: [PATCH] bridge: don't bring up internal ports by default. +[PATCH] bridge: don't bring up internal ports by default. It should be an administrator task to bring up devices as they are configured properly. @@ -29,7 +26,7 @@ Signed-off-by: Ben Pfaff 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NEWS b/NEWS -index 839b4dd..91d9194 100644 +index e1fb093..51849fe 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,8 @@ @@ -38,11 +35,11 @@ index 839b4dd..91d9194 100644 + should be an administrator task to bring up devices as they are + configured properly. + - v2.1.0 - 19 Mar 2014 + v2.1.2 - 30 Apr 2014 --------------------- - - Address prefix tracking support for flow tables. New columns + - Bug fixes. diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at -index 1a58da6..fbd40ff 100644 +index 618ea8d..b359e5f 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at @@ -1937,7 +1937,7 @@ IFCOUNTERS @@ -112,10 +109,10 @@ index f6a62cd..dd56b39 100644 ]) OVS_VSWITCHD_STOP diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c -index b72f0d8..5b81d62 100644 +index 796fe48..79f2402 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c -@@ -1448,8 +1448,7 @@ iface_do_create(const struct bridge *br, +@@ -1488,8 +1488,7 @@ iface_do_create(const struct bridge *br, VLOG_INFO("bridge %s: added interface %s on port %d", br->name, iface_cfg->name, *ofp_portp); @@ -125,6 +122,3 @@ index b72f0d8..5b81d62 100644 netdev_turn_flags_on(netdev, NETDEV_UP, NULL); } --- -1.8.5.3 - diff --git a/openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch b/openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch deleted file mode 100644 index 9280906..0000000 --- a/openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 490db96efaf89c63656b192d5ca287b0908a6c77 Mon Sep 17 00:00:00 2001 -From: Flavio Leitner -Date: Tue, 14 Jan 2014 00:22:07 -0200 -Subject: [PATCH] rhel: Enable DHCP support for internal ports. - -The current initscripts ifup-ovs brings up internal ports as -an ordinary ethernet device, so BOOTPROTO=dhcp|none does not -consider any OVS/bridge detail. - -Since DHCP requires a port in the bridge to reach the server, -bring up the required port before in the same way it does for -OVS bridge. - -Signed-off-by: Flavio Leitner -Signed-off-by: Gurucharan Shetty ---- - rhel/README.RHEL | 38 +++++++++++++++++++++++++++++ - rhel/etc_sysconfig_network-scripts_ifup-ovs | 7 +++++- - 2 files changed, 44 insertions(+), 1 deletion(-) - -diff --git a/rhel/README.RHEL b/rhel/README.RHEL -index 435772f..cb6ab88 100644 ---- a/rhel/README.RHEL -+++ b/rhel/README.RHEL -@@ -87,6 +87,44 @@ OVSBOOTPROTO="dhcp" - OVSDHCPINTERFACES="eth0" - HOTPLUG=no - -+ -+Adding Internal Port to ovsbridge0: -+ -+==> ifcfg-intbr0 <== -+DEVICE=intbr0 -+ONBOOT=yes -+DEVICETYPE=ovs -+TYPE=OVSIntPort -+OVS_BRIDGE=ovsbridge0 -+HOTPLUG=no -+ -+ -+Internal Port with fixed IP address: -+ -+DEVICE=intbr0 -+ONBOOT=yes -+DEVICETYPE=ovs -+TYPE=OVSIntPort -+OVS_BRIDGE=ovsbridge0 -+BOOTPROTO=static -+IPADDR=A.B.C.D -+NETMASK=X.Y.Z.0 -+HOTPLUG=no -+ -+Internal Port with DHCP: -+* Needs OVSBOOTPROTO or BOOTPROTO. -+* All the interfaces that can reach the DHCP server -+as a space separated list in OVSDHCPINTERFACES. -+ -+DEVICE=intbr0 -+ONBOOT=yes -+DEVICETYPE=ovs -+TYPE=OVSIntPort -+OVS_BRIDGE=ovsbridge0 -+OVSBOOTPROTO="dhcp" -+OVSDHCPINTERFACES="eth0" -+HOTPLUG=no -+ - Adding physical eth0 to ovsbridge0 described above: - - ==> ifcfg-eth0 <== -diff --git a/rhel/etc_sysconfig_network-scripts_ifup-ovs b/rhel/etc_sysconfig_network-scripts_ifup-ovs -index 3f31c30..0ee7b21 100755 ---- a/rhel/etc_sysconfig_network-scripts_ifup-ovs -+++ b/rhel/etc_sysconfig_network-scripts_ifup-ovs -@@ -115,7 +115,12 @@ case "$TYPE" in - OVSIntPort) - ifup_ovs_bridge - ovs-vsctl -t ${TIMEOUT} -- --may-exist add-port "$OVS_BRIDGE" "$DEVICE" $OVS_OPTIONS -- set Interface "$DEVICE" type=internal ${OVS_EXTRA+-- $OVS_EXTRA} -- ${OTHERSCRIPT} ${CONFIG} ${2} -+ if [ -n "${OVSDHCPINTERFACES}" ]; then -+ for _iface in ${OVSDHCPINTERFACES}; do -+ /sbin/ifup ${_iface} -+ done -+ fi -+ BOOTPROTO="${OVSBOOTPROTO}" ${OTHERSCRIPT} ${CONFIG} ${2} - ;; - OVSBond) - ifup_ovs_bridge --- -1.8.4.2 - diff --git a/openvswitch.spec b/openvswitch.spec index 707742a..462da0b 100644 --- a/openvswitch.spec +++ b/openvswitch.spec @@ -14,7 +14,7 @@ %endif Name: openvswitch -Version: 2.1.0 +Version: 2.1.2 Release: 1%{?dist} Summary: Open vSwitch daemon/database/utilities @@ -30,7 +30,6 @@ Source6: ovsdbmonitor.desktop Source9: README.RHEL Patch1: openvswitch-fedora-package-fix-systemd-ordering-and-deps.patch -Patch2: openvswitch-rhel-Enable-DHCP-support-for-internal-ports.patch Patch3: openvswitch-bridge-don-t-bring-up-internal-ports-by-default.patch Patch4: openvswitch-ovs-lib-allow-non-root-users-to-check-service-status.patch Patch5: openvswitch-rhel-Add-Patch-Port-support-to-initscripts.patch @@ -105,7 +104,6 @@ files needed to build an external application. %prep %setup -q %patch1 -p1 -%patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -304,6 +302,9 @@ install -p -D -m 0644 include/openflow/*.h \ %{_includedir}/openflow/* %changelog +* Tue Mar 25 2014 Flavio Leitner - 2.1.2-1 +- updated to 2.1.2 + * Tue Mar 25 2014 Flavio Leitner - 2.1.0-1 - updated to 2.1.0 - obsoleted openvswitch-controller package diff --git a/sources b/sources index 387296d..c5ab20f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c5861b0ef7f3002c15c61be6f5066f2 openvswitch-2.1.0.tar.gz +430ff6d1e1fc81e9c5ebc2e641cfc953 openvswitch-2.1.2.tar.gz