X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=xenserver%2Fvswitch-xen.spec;h=49fb8cbaa61ecc6881083a5b1ae01f29a16669f9;hb=635c9298b91d0942aca39ba1f0d7ea5805ab618e;hp=313f1b633912c19f44c367f8a2d6923a84e30f04;hpb=fea28b07bb69201ebaa1724a95fc764483a72f7d;p=sliver-openvswitch.git diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec index 313f1b633..49fb8cbaa 100644 --- a/xenserver/vswitch-xen.spec +++ b/xenserver/vswitch-xen.spec @@ -1,6 +1,6 @@ # Spec file for vswitch and related programs. -# Copyright (C) 2009 Nicira Networks, Inc. +# Copyright (C) 2009, 2010 Nicira Networks, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright @@ -19,6 +19,7 @@ Name: vswitch Summary: Virtual switch Group: System Environment/Daemons URL: http://www.openvswitch.org/ +Vendor: Nicira Networks, Inc. Version: %{vswitch_version} # The entire source code is ASL 2.0 except datapath/ which is GPLv2 @@ -67,14 +68,18 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/xapi.d/plugins install -m 755 xenserver/etc_xapi.d_plugins_vswitch-cfg-update \ $RPM_BUILD_ROOT/etc/xapi.d/plugins/vswitch-cfg-update install -d -m 755 $RPM_BUILD_ROOT/usr/share/vswitch/scripts -install -m 644 vswitchd/vswitch-idl.ovsschema \ - $RPM_BUILD_ROOT/usr/share/vswitch/vswitch-idl.ovsschema +install -m 644 vswitchd/vswitch.ovsschema \ + $RPM_BUILD_ROOT/usr/share/vswitch/vswitch.ovsschema install -m 755 xenserver/opt_xensource_libexec_interface-reconfigure \ $RPM_BUILD_ROOT/usr/share/vswitch/scripts/interface-reconfigure +install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigure.py \ + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/InterfaceReconfigure.py +install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py \ + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/InterfaceReconfigureBridge.py +install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py \ + $RPM_BUILD_ROOT/usr/share/vswitch/scripts/InterfaceReconfigureVswitch.py install -m 755 xenserver/etc_xensource_scripts_vif \ $RPM_BUILD_ROOT/usr/share/vswitch/scripts/vif -install -m 755 xenserver/usr_share_vswitch_scripts_dump-vif-details \ - $RPM_BUILD_ROOT/usr/share/vswitch/scripts/dump-vif-details install -m 755 xenserver/usr_share_vswitch_scripts_refresh-xs-network-uuids \ $RPM_BUILD_ROOT/usr/share/vswitch/scripts/refresh-xs-network-uuids install -m 755 xenserver/usr_sbin_xen-bugtool \ @@ -105,8 +110,6 @@ rm \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-openflowd.8 \ $RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8 rm -f $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/vswitch/veth_mod.ko -rm -r \ - $RPM_BUILD_ROOT/usr/share/openvswitch/commands install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch @@ -131,6 +134,15 @@ EOF elif md5sum -c --status < /dev/null +fi # Create default or update existing /etc/sysconfig/vswitch. SYSCONFIG=/etc/sysconfig/vswitch @@ -212,13 +231,16 @@ mkdir -p /usr/lib/vswitch/xs-original \ || 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 do s=$(basename "$f") t=$(readlink "$f") - if [ "$t" != "/usr/share/vswitch/scripts/$s" ]; then + if [ -f "$f" ] && [ "$t" != "/usr/share/vswitch/scripts/$s" ]; then mv "$f" /usr/lib/vswitch/xs-original/ \ || printf "Could not save original XenServer $s script\n" ln -s "/usr/share/vswitch/scripts/$s" "$f" \ @@ -242,6 +264,9 @@ for s in vswitch vswitch-xapi-update; do chkconfig $s on || printf "Could not enable $s init script." done +# Configure system to use vswitch +echo vswitch > /etc/xensource/network.conf + if [ "$1" = "1" ]; then # $1 = 2 for upgrade printf "\nYou MUST reboot the server NOW to complete the change to the\n" printf "the vSwitch. Attempts to modify networking on the server\n" @@ -290,7 +315,10 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade rm -f /etc/ovs-vswitchd.conf.db rm -f /etc/sysconfig/vswitch rm -f /etc/ovs-vswitchd.cacert - rm -f /var/lib/openvswitch/dbcache + 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" @@ -311,22 +339,17 @@ fi %if %(echo '%{xen_version}'|awk -F"." '{if ($3>=18) print 1; else print 0;}') /lib/modules/%{xen_version}/kernel/net/vswitch/ip_gre_mod.ko %endif -/usr/share/vswitch/scripts/dump-vif-details /usr/share/vswitch/scripts/refresh-xs-network-uuids /usr/share/vswitch/scripts/interface-reconfigure +/usr/share/vswitch/scripts/InterfaceReconfigure.py +/usr/share/vswitch/scripts/InterfaceReconfigureBridge.py +/usr/share/vswitch/scripts/InterfaceReconfigureVswitch.py /usr/share/vswitch/scripts/vif /usr/share/vswitch/scripts/xen-bugtool /usr/share/vswitch/scripts/XSFeatureVSwitch.py /usr/share/vswitch/scripts/brctl /usr/share/vswitch/scripts/sysconfig.template -# Following two files are generated automatically by rpm. We don't -# really need them and they won't be used on the XenServer, but there -# isn't an obvious place to get rid of them since they are generated -# after the install script runs. Since they are small, we just -# include them. -/usr/share/vswitch/scripts/XSFeatureVSwitch.pyc -/usr/share/vswitch/scripts/XSFeatureVSwitch.pyo -/usr/share/vswitch/vswitch-idl.ovsschema +/usr/share/vswitch/vswitch.ovsschema /usr/sbin/ovs-brcompatd /usr/sbin/ovs-vswitchd /usr/sbin/ovsdb-server @@ -346,3 +369,5 @@ fi /usr/share/man/man8/ovs-vsctl.8.gz /usr/share/man/man8/ovs-vswitchd.8.gz /var/lib/openvswitch +%exclude /usr/share/vswitch/scripts/*.pyc +%exclude /usr/share/vswitch/scripts/*.pyo