X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopenvswitch-xen.spec;h=4d03991d09d43ca8e77663113f088fa51324fb0c;hb=0b18063d0ad94dafb8d74de9d6ad04da894228d2;hp=9a533a8385cec56216e3c707c3ff78ce48fa137e;hpb=34edeccfd8d4273844d12c85fe38ec47002c47cd;p=sliver-openvswitch.git diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index 9a533a838..4d03991d0 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -12,28 +12,48 @@ # for example: # # rpmbuild -D "openvswitch_version 0.8.9~1+build123" -D "xen_version 2.6.18-128.1.1.el5.xs5.1.0.483.1000xen" -D "build_number --with-build-number=123" -bb /usr/src/redhat/SPECS/openvswitch-xen.spec -# + %define version %{openvswitch_version}-%{xen_version} +# bump this when breaking compatibility with userspace +%define module_abi_version 0 + +# extract kernel type (xen or kdump) +%define binsuffix -%(echo '%{xen_version}' | sed -r 's/^.*[0-9]+//') +# kernel version string w/o kernel type +%define kernel_version %(echo '%{xen_version}' | sed -r 's/[a-z]+$//') +# build-supplemental-pack.sh requires this naming for kernel module packages +%define module_package modules%{binsuffix}-%{kernel_version} + Name: openvswitch -Summary: Virtual switch +Summary: Open vSwitch daemon/database/utilities Group: System Environment/Daemons URL: http://www.openvswitch.org/ Vendor: Nicira Networks, Inc. Version: %{openvswitch_version} -# The entire source code is ASL 2.0 except datapath/ which is GPLv2 -License: ASL 2.0 and GPLv2 +License: ASL 2.0 Release: 1 Source: openvswitch-%{openvswitch_version}.tar.gz Buildroot: /tmp/openvswitch-xen-rpm -Requires: kernel-xen = %(echo '%{xen_version}' | sed 's/xen$//') +Requires: openvswitch_mod.ko.%{module_abi_version} %description Open vSwitch provides standard network bridging functions augmented with support for the OpenFlow protocol for remote per-flow control of traffic. +%package %{module_package} +Summary: Open vSwitch kernel module +Group: System Environment/Kernel +License: GPLv2 +Provides: %{name}-modules = %{kernel_version}, openvswitch_mod.ko.%{module_abi_version} +Requires: kernel%{binsuffix} = %{kernel_version} + +%description %{module_package} +Open vSwitch Linux kernel module compiled against kernel version +%{xen_version}. + %prep %setup -q -n openvswitch-%{openvswitch_version} @@ -60,6 +80,12 @@ install -m 755 xenserver/etc_profile.d_openvswitch.sh \ install -d -m 755 $RPM_BUILD_ROOT/etc/xapi.d/plugins install -m 755 xenserver/etc_xapi.d_plugins_openvswitch-cfg-update \ $RPM_BUILD_ROOT/etc/xapi.d/plugins/openvswitch-cfg-update +install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/network-status +install -m 644 xenserver/etc_xensource_bugtool_network-status_openvswitch.xml \ + $RPM_BUILD_ROOT/etc/xensource/bugtool/network-status/openvswitch.xml +install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info +install -m 644 xenserver/etc_xensource_bugtool_kernel-info_openvswitch.xml \ + $RPM_BUILD_ROOT/etc/xensource/bugtool/kernel-info/openvswitch.xml install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts install -m 644 vswitchd/vswitch.ovsschema \ $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema @@ -73,12 +99,12 @@ install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/InterfaceReconfigureVswitch.py install -m 755 xenserver/etc_xensource_scripts_vif \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/vif -install -m 755 xenserver/usr_share_openvswitch_scripts_ovs-external-ids \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-external-ids -install -m 755 xenserver/usr_sbin_xen-bugtool \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool +install -m 755 xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-xapi-sync install -m 755 xenserver/usr_share_openvswitch_scripts_sysconfig.template \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/sysconfig.template +install -m 755 xenserver/usr_share_openvswitch_scripts_xen-bugtool-tc-class-show \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool-tc-class-show install -m 755 utilities/ovs-save \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovs-save install -d -m 755 $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base @@ -93,13 +119,9 @@ install xenserver/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python # Get rid of stuff we don't want to make RPM happy. rm \ $RPM_BUILD_ROOT/usr/bin/ovs-controller \ - $RPM_BUILD_ROOT/usr/bin/ovs-discover \ - $RPM_BUILD_ROOT/usr/bin/ovs-kill \ $RPM_BUILD_ROOT/usr/bin/ovs-openflowd \ $RPM_BUILD_ROOT/usr/bin/ovs-pki \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-controller.8 \ - $RPM_BUILD_ROOT/usr/share/man/man8/ovs-discover.8 \ - $RPM_BUILD_ROOT/usr/share/man/man8/ovs-kill.8 \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-openflowd.8 \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 @@ -109,29 +131,6 @@ install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch rm -rf $RPM_BUILD_ROOT %post -if test ! -e /var/xapi/network.dbcache; then - if test "$1" = 1; then - printf "Creating xapi database cache... " - else - printf "warning: Open vSwitch is being re-installed or upgraded,\n" - printf " but the xapi database cache is missing.\n" - printf "Re-creating xapi database cache... " - fi - - if /usr/share/openvswitch/scripts/interface-reconfigure rewrite; then - printf "done.\n" - else - printf "FAILED\n" - printf "Open vSwitch can only be installed on a XenServer that\n" - printf "has connectivity to xapi on the pool master. Please\n" - printf "fix connectivity to the pool master, then try again.\n" - exit 1 - fi -fi - -# Ensure that modprobe will find our modules. -depmod %{xen_version} - if grep -F net.ipv4.conf.all.arp_filter /etc/sysctl.conf >/dev/null 2>&1; then :; else cat >>/etc/sysctl.conf </dev/null 2>&1; then @@ -205,20 +224,33 @@ for s in openvswitch openvswitch-xapi-update; do chkconfig $s on || printf "Could not enable $s init script." done -# Configure system to use Open vSwitch -echo vswitch > /etc/xensource/network.conf - if [ "$1" = "1" ]; then # $1 = 2 for upgrade + # Configure system to use Open vSwitch + echo vswitch > /etc/xensource/network.conf + printf "\nYou MUST reboot the server NOW to complete the change to\n" printf "Open vSwitch. Attempts to modify networking on the server\n" printf "or any hosted VM will fail until after the reboot and could\n" printf "leave the server in an state requiring manual recovery.\n\n" else - printf "\nTo use the new Open vSwitch install, you should reboot the\n" - printf "server now. Failure to do so may result in incorrect operation." + + mode=$(cat /etc/xensource/network.conf) + if [ "$mode" != "vswitch" ] && [ "$mode" != "openvswitch" ]; then + printf "\nThe server is not configured to run Open vSwitch. To run in\n" + printf "vswitch mode, you must run the following command:\n\n" + printf "\txe-switch-network-backend vswitch" + else + printf "\nTo use the new Open vSwitch install, you should reboot the\n" + printf "server now. Failure to do so may result in incorrect operation." + fi + printf "\n\n" fi +%post %{module_package} +# Ensure that modprobe will find our modules. +depmod %{xen_version} + %preun if [ "$1" = "0" ]; then # $1 = 1 for upgrade for s in openvswitch openvswitch-xapi-update; do @@ -226,8 +258,38 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade done fi - %postun +# Restore original XenServer scripts if the OVS equivalent no longer exists. +# This works both in the upgrade and erase cases. +# This lists every file that every version of OVS has ever replaced. Never +# remove old files that OVS no longer replaces, or upgrades from old versions +# will fail to restore the XS originals, leaving the system in a broken state. +# Also be sure to add removed script paths to the %post scriptlet above to +# prevent the same problem when upgrading from old versions of OVS that lack +# this restore-on-upgrade logic. +for f in \ + /etc/xensource/scripts/vif \ + /usr/sbin/brctl \ + /usr/sbin/xen-bugtool \ + /opt/xensource/libexec/interface-reconfigure \ + /opt/xensource/libexec/InterfaceReconfigure.py \ + /opt/xensource/libexec/InterfaceReconfigureBridge.py \ + /opt/xensource/libexec/InterfaceReconfigureVswitch.py +do + # Only revert dangling symlinks. + if [ -h "$f" ] && [ ! -e "$f" ]; then + s=$(basename "$f") + if [ ! -f "/usr/lib/openvswitch/xs-saved/$s" ]; then + printf "Original XenServer $s script not present in /usr/lib/openvswitch/xs-saved\n" >&2 + printf "Could not restore original XenServer script.\n" >&2 + else + (rm -f "$f" \ + && mv "/usr/lib/openvswitch/xs-saved/$s" "$f") \ + || printf "Could not restore original XenServer $s script.\n" >&2 + fi + fi +done + if [ "$1" = "0" ]; then # $1 = 1 for upgrade rm -f /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyc \ /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyo @@ -237,27 +299,7 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyc \ /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyo \ /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyc \ - /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyo - - # Restore original XenServer scripts - for f in \ - /opt/xensource/libexec/interface-reconfigure \ - /opt/xensource/libexec/InterfaceReconfigure.py \ - /opt/xensource/libexec/InterfaceReconfigureBridge.py \ - /opt/xensource/libexec/InterfaceReconfigureVswitch.py \ - /etc/xensource/scripts/vif \ - /usr/sbin/xen-bugtool - do - s=$(basename "$f") - if [ ! -f "/usr/lib/openvswitch/xs-original/$s" ]; then - printf "Original XenServer $s script not present in /usr/lib/openvswitch/xs-original\n" - printf "Could not restore original XenServer script.\n" - else - (rm -f "$f" \ - && mv "/usr/lib/openvswitch/xs-original/$s" "$f") \ - || printf "Could not restore original XenServer $s script.\n" - fi - done + /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyo # Remove all configuration files rm -f /etc/openvswitch/conf.db @@ -265,6 +307,9 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade rm -f /etc/openvswitch/vswitchd.cacert rm -f /var/xapi/network.dbcache + # Remove saved XenServer scripts directory, but only if it's empty + rmdir -p /usr/lib/openvswitch/xs-saved 2>/dev/null + # Configure system to use bridge echo bridge > /etc/xensource/network.conf @@ -274,15 +319,15 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade printf "could leave the server in a state requiring manual recovery.\n\n" fi - %files %defattr(-,root,root) /etc/init.d/openvswitch /etc/init.d/openvswitch-xapi-update /etc/xapi.d/plugins/openvswitch-cfg-update +/etc/xensource/bugtool/network-status/openvswitch.xml +/etc/xensource/bugtool/kernel-info/openvswitch.xml /etc/logrotate.d/openvswitch /etc/profile.d/openvswitch.sh -/lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko /usr/share/openvswitch/python/ovs/__init__.py /usr/share/openvswitch/python/ovs/daemon.py /usr/share/openvswitch/python/ovs/db/__init__.py @@ -305,16 +350,17 @@ fi /usr/share/openvswitch/python/ovs/timeval.py /usr/share/openvswitch/python/ovs/util.py /usr/share/openvswitch/python/uuid.py -/usr/share/openvswitch/scripts/ovs-external-ids +/usr/share/openvswitch/scripts/ovs-xapi-sync /usr/share/openvswitch/scripts/interface-reconfigure /usr/share/openvswitch/scripts/InterfaceReconfigure.py /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.py /usr/share/openvswitch/scripts/InterfaceReconfigureVswitch.py /usr/share/openvswitch/scripts/vif -/usr/share/openvswitch/scripts/xen-bugtool /usr/share/openvswitch/scripts/sysconfig.template +/usr/share/openvswitch/scripts/xen-bugtool-tc-class-show /usr/share/openvswitch/scripts/ovs-save /usr/share/openvswitch/vswitch.ovsschema +/usr/sbin/ovs-vlan-bug-workaround /usr/sbin/ovs-vswitchd /usr/sbin/ovsdb-server /usr/bin/ovs-appctl @@ -337,11 +383,11 @@ fi /usr/share/man/man8/ovs-parse-leaks.8.gz /usr/share/man/man1/ovs-pcap.1.gz /usr/share/man/man1/ovs-tcpundump.1.gz +/usr/share/man/man8/ovs-vlan-bug-workaround.8.gz /usr/share/man/man8/ovs-vlan-test.8.gz /usr/share/man/man8/ovs-vsctl.8.gz /usr/share/man/man8/ovs-vswitchd.8.gz /var/lib/openvswitch -%exclude /lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko %exclude /usr/lib/xsconsole/plugins-base/*.py[co] %exclude /usr/sbin/ovs-brcompatd %exclude /usr/share/man/man8/ovs-brcompatd.8.gz @@ -349,3 +395,7 @@ fi %exclude /usr/share/openvswitch/python/*.py[co] %exclude /usr/share/openvswitch/python/ovs/*.py[co] %exclude /usr/share/openvswitch/python/ovs/db/*.py[co] + +%files %{module_package} +/lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko +%exclude /lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko