X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fopenvswitch-xen.spec;h=4dbc71b12b20c0ea98af9da29d9556639132f24c;hb=d422c1189901d34125cd2d46552391c333d1f647;hp=c796a1befe5287361cd3ee5409ce6465f2887d9d;hpb=b9e09a071d7d01b87c70341a9e9111b0c353c867;p=sliver-openvswitch.git diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index c796a1bef..4dbc71b12 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -1,6 +1,6 @@ # Spec file for Open vSwitch. -# Copyright (C) 2009, 2010 Nicira Networks, Inc. +# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -8,37 +8,59 @@ # without warranty of any kind. # When building, the rpmbuild command line should define -# openvswitch_version, xen_version, and build_number using -D arguments. +# openvswitch_version, kernel_name, kernel_version, kernel_flavor, +# and build_number using -D arguments. # 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} +# rpmbuild -D "openvswitch_version 1.1.0+build123" +# -D "kernel_name NAME-xen" +# -D "kernel_version 2.6.32.12-0.7.1.xs5.6.100.323.170596" +# -D "kernel_flavor xen" +# -D "build_number --with-build-number=123" +# -bb /usr/src/redhat/SPECS/openvswitch-xen.spec + +%define xen_version %{kernel_version}%{kernel_flavor} + +# bump this when breaking compatibility with userspace +%define module_abi_version 0 + +# build-supplemental-pack.sh requires this naming for kernel module packages +%define module_package modules-%{kernel_flavor}-%{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_flavor} = %{kernel_version}, openvswitch_mod.ko.%{module_abi_version} +Requires: kernel-%{kernel_name} = %{kernel_version} + +%description %{module_package} +Open vSwitch Linux kernel module compiled against kernel version +%{xen_version}. + %prep %setup -q -n openvswitch-%{openvswitch_version} %build -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-l26=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=%{_localstatedir} --with-linux=/lib/modules/%{xen_version}/build --enable-ssl %{build_number} make %{_smp_mflags} %install @@ -61,8 +83,6 @@ 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/usr/share/openvswitch/scripts -install -m 644 vswitchd/vswitch.ovsschema \ - $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/interface-reconfigure install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigure.py \ @@ -73,12 +93,8 @@ 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_refresh-network-uuids \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/refresh-network-uuids -install -m 755 xenserver/usr_sbin_xen-bugtool \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool -install -m 755 xenserver/usr_sbin_brctl \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/brctl +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 -d -m 755 $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base @@ -86,22 +102,25 @@ install -m 644 \ xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \ $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py -install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch -find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch \; +install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch +find datapath/linux -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/extra/openvswitch \; +install python/compat/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python +install python/compat/argparse.py $RPM_BUILD_ROOT/usr/share/openvswitch/python + +install -d -m 755 $RPM_BUILD_ROOT/etc/xensource/bugtool +mv $RPM_BUILD_ROOT/etc/openvswitch/bugtool-plugins/* $RPM_BUILD_ROOT/etc/xensource/bugtool # Get rid of stuff we don't want to make RPM happy. rm \ + $RPM_BUILD_ROOT/usr/bin/ovs-benchmark \ + $RPM_BUILD_ROOT/usr/sbin/ovs-bugtool \ $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/bin/ovs-wdt \ - $RPM_BUILD_ROOT/usr/sbin/ovs-monitor \ + $RPM_BUILD_ROOT/usr/bin/ovs-test \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-test.8 \ + $RPM_BUILD_ROOT/usr/share/man/man1/ovs-benchmark.1 \ + $RPM_BUILD_ROOT/usr/share/man/man8/ovs-bugtool.8 \ $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 install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch @@ -110,77 +129,6 @@ install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch rm -rf $RPM_BUILD_ROOT %post -if [ ! -f /etc/xensource-inventory ]; then - printf "XenSource inventory not present in /etc/xensource-inventory" - exit 1 -fi - -if [ "$1" = "1" ]; then - if md5sum -c --status </dev/null 2>&1; then :; else cat >>/etc/sysctl.conf < /dev/null fi @@ -224,28 +172,47 @@ else done fi +# Deliberately break %postun in broken OVS builds that revert original +# XenServer scripts during rpm -U by moving the directory where it thinks +# they are saved. +if [ -d /usr/lib/openvswitch/xs-original ]; then + mkdir -p /usr/lib/openvswitch/xs-saved + mv /usr/lib/openvswitch/xs-original/* /usr/lib/openvswitch/xs-saved/ && + rmdir /usr/lib/openvswitch/xs-original +fi + # Replace XenServer files by our versions. -mkdir -p /usr/lib/openvswitch/xs-original \ +mkdir -p /usr/lib/openvswitch/xs-saved \ || printf "Could not create script backup directory.\n" 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 \ - /usr/sbin/brctl + /etc/xensource/scripts/vif do s=$(basename "$f") t=$(readlink "$f") if [ -f "$f" ] && [ "$t" != "/usr/share/openvswitch/scripts/$s" ]; then - mv "$f" /usr/lib/openvswitch/xs-original/ \ + mv "$f" /usr/lib/openvswitch/xs-saved/ \ || printf "Could not save original XenServer $s script\n" ln -s "/usr/share/openvswitch/scripts/$s" "$f" \ || printf "Could not link to Open vSwitch $s script\n" fi done +# Clean up dangling symlinks to removed OVS replacement scripts no longer +# provided by OVS. Any time a replacement script is removed from OVS, +# it should be added here to ensure correct reversion from old versions of +# OVS that don't clean up dangling symlinks during the uninstall phase. +for orig in \ + /usr/sbin/brctl \ + /usr/sbin/xen-bugtool +do + saved=/usr/lib/openvswitch/xs-saved/$(basename "$orig") + [ -e "$saved" ] && mv -f "$saved" "$orig" +done + # Ensure all required services are set to run for s in openvswitch openvswitch-xapi-update; do if chkconfig --list $s >/dev/null 2>&1; then @@ -255,31 +222,81 @@ 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 = 1 for install + # Configure system to use Open vSwitch + /opt/xensource/bin/xe-switch-network-backend vswitch +else # $1 = 2 for upgrade + + 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 -if [ "$1" = "1" ]; then # $1 = 2 for upgrade - 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." printf "\n\n" fi +%posttrans %{module_package} +# Ensure that modprobe will find our modules. +# +# This has to be in %posttrans instead of %post because older versions +# installed modules into a different directory and "rpm -U" runs the +# new version's %post before removing the old version's files, so if +# we use %post then depmod may find the old versions that are about to +# be removed. +depmod %{xen_version} + %preun -if [ "$1" = "0" ]; then # $1 = 1 for upgrade +if [ "$1" = "0" ]; then # $1 = 0 for uninstall + # Configure system to use bridge + /opt/xensource/bin/xe-switch-network-backend bridge + + # The "openvswitch" service should have been removed from + # "xe-switch-network-backend bridge". for s in openvswitch openvswitch-xapi-update; do - chkconfig --del $s || printf "Could not remove $s init script." + if chkconfig --list $s >/dev/null 2>&1; then + chkconfig --del $s || printf "Could not remove $s init script." + fi done fi - %postun -if [ "$1" = "0" ]; then # $1 = 1 for upgrade +# 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 = 0 for uninstall rm -f /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyc \ /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyo @@ -288,73 +305,50 @@ 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 \ - /usr/sbin/brctl - 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 rm -f /etc/sysconfig/openvswitch rm -f /etc/openvswitch/vswitchd.cacert - rm -f /var/xapi/network.dbcache - - # Configure system to use bridge - echo bridge > /etc/xensource/network.conf - printf "\nYou MUST reboot the server now to complete the change to\n" - printf "standard Xen networking. Attempts to modify networking on the\n" - printf "server or any hosted VM will fail until after the reboot and\n" - printf "could leave the server in a state requiring manual recovery.\n\n" + # Remove saved XenServer scripts directory, but only if it's empty + rmdir -p /usr/lib/openvswitch/xs-saved 2>/dev/null fi +exit 0 %files %defattr(-,root,root) /etc/init.d/openvswitch /etc/init.d/openvswitch-xapi-update /etc/xapi.d/plugins/openvswitch-cfg-update +/etc/xensource/bugtool/* /etc/logrotate.d/openvswitch /etc/profile.d/openvswitch.sh -/lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko -/lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko -%if %(echo '%{xen_version}'|awk -F"[.-]" '{if ($3==18) print 1; else print 0;}') -/lib/modules/%{xen_version}/kernel/extra/openvswitch/veth_mod.ko -%endif -/usr/share/openvswitch/scripts/refresh-network-uuids +/usr/share/openvswitch/python/ +/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/brctl /usr/share/openvswitch/scripts/sysconfig.template +/usr/share/openvswitch/scripts/ovs-bugtool-* +/usr/share/openvswitch/scripts/ovs-save +/usr/share/openvswitch/scripts/ovs-ctl +/usr/share/openvswitch/scripts/ovs-lib /usr/share/openvswitch/vswitch.ovsschema -/usr/sbin/ovs-brcompatd +/usr/sbin/ovs-vlan-bug-workaround /usr/sbin/ovs-vswitchd /usr/sbin/ovsdb-server /usr/bin/ovs-appctl /usr/bin/ovs-dpctl /usr/bin/ovs-ofctl +/usr/bin/ovs-parse-leaks +/usr/bin/ovs-pcap +/usr/bin/ovs-tcpundump +/usr/bin/ovs-vlan-test /usr/bin/ovs-vsctl /usr/bin/ovsdb-client /usr/bin/ovsdb-tool @@ -364,13 +358,25 @@ fi /usr/share/man/man1/ovsdb-tool.1.gz /usr/share/man/man5/ovs-vswitchd.conf.db.5.gz /usr/share/man/man8/ovs-appctl.8.gz -/usr/share/man/man8/ovs-brcompatd.8.gz +/usr/share/man/man8/ovs-ctl.8.gz /usr/share/man/man8/ovs-dpctl.8.gz /usr/share/man/man8/ovs-ofctl.8.gz +/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 /usr/lib/xsconsole/plugins-base/*.pyc -%exclude /usr/lib/xsconsole/plugins-base/*.pyo -%exclude /usr/share/openvswitch/scripts/*.pyc -%exclude /usr/share/openvswitch/scripts/*.pyo +%exclude /usr/lib/xsconsole/plugins-base/*.py[co] +%exclude /usr/sbin/ovs-brcompatd +%exclude /usr/share/man/man8/ovs-brcompatd.8.gz +%exclude /usr/share/openvswitch/scripts/*.py[co] +%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}/extra/openvswitch/openvswitch_mod.ko +%exclude /lib/modules/%{xen_version}/extra/openvswitch/brcompat_mod.ko