mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-19 14:37:21 +00:00
Code Issues Releases Wiki Activity

xenserver: Disable brcompatd except on XenServer 5.5.0

Browse Source 
The compat layer is now unused in the vswitch branch of XenServer.

Based on change originally by Ian Campbell, cherry-picked from
"xs5.7" branch.  The original change was not conditional on the
XenServer version.
This commit is contained in:
Ian Campbell
2010-03-26 13:24:06 -07:00
committed by Ben Pfaff
parent a1864c5f89
commit 06e41baf2a
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
xenserver/etc_init.d_openvswitch
View File

@@ -21,11 +21,19 @@
. /etc/init.d/functions
. /etc/xensource-inventory
test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
# General config variables in /etc/sysconfig/openvswitch
: ${ENABLE_BRCOMPAT:=y}
: ${ENABLE_FAKE_PROC_NET:=y}
if test "$PRODUCT_VERSION" = "5.5.0"; then
# XenServer 5.5.0 needs ovs-brcompatd and /proc/net simulation.
: ${ENABLE_BRCOMPAT:=y}
: ${ENABLE_FAKE_PROC_NET:=y}
else
# Later versions don't need them.
: ${ENABLE_BRCOMPAT:=n}
: ${ENABLE_FAKE_PROC_NET:=n}
fi
: ${ENABLE_MONITOR:=y}
: ${FORCE_COREFILES:=y}
@@ -115,7 +123,7 @@ function insert_modules_if_required {
action "Inserting llc module" modprobe llc
action "Inserting openvswitch module" modprobe openvswitch_mod
fi
if [ -n "$BRCOMPATD_PIDFILE" ] && ! lsmod | grep -q "brcompat_mod"; then
if [ "$ENABLE_BRCOMPATD" = "y" ] && [ -n "$BRCOMPATD_PIDFILE" ] && ! lsmod | grep -q "brcompat_mod"; then
action "Inserting brcompat module" modprobe brcompat_mod
fi
if [ -f "/lib/modules/`uname -r`/kernel/net/openvswitch/ip_gre_mod.ko" ] && ! lsmod | grep -q "ip_gre_mod"; then
@@ -338,10 +346,9 @@ EOF
}
function set_system_uuid {
system_uuid=$(. /etc/xensource-inventory && echo $INSTALLATION_UUID)
if test -n "$system_uuid"; then
if test -n "$INSTALLATION_UUID"; then
action "Configuring Open vSwitch system UUID" true
$vsctl --no-wait set Open_vSwitch . external-ids:system-uuid="$system_uuid"
$vsctl --no-wait set Open_vSwitch . external-ids:system-uuid="$INSTALLATION_UUID"
else
action "Configuring Open vSwitch system UUID" false
fi

8
xenserver/usr_share_openvswitch_scripts_sysconfig.template
View File

@@ -9,13 +9,17 @@
# ENABLE_BRCOMPAT: If 'y' than emulate linux bridging interfaces
# using the brcompat kernel module and ovs-brcompatd daemon
# ENABLE_BRCOMPAT=y
# This is required and enabled by default for XenServer 5.5.0,
# and not required and not enabled by default for later versions.
# ENABLE_BRCOMPAT=?
# ENABLE_FAKE_PROC_NET: If 'y' then emulate linux bonding and vlan
# files in /proc as if the bonding and vlan demultiplexing done in
# ovs-vswitchd were being implemented using existing Linux mechanisms.
# This is useful in some cases when replacing existing solutions.
# ENABLE_FAKE_PROC_NET=y
# This is required and enabled by default for XenServer 5.5.0,
# and not required and not enabled by default for later versions.
# ENABLE_FAKE_PROC_NET=?
# ENABLE_MONITOR: If 'y' then monitor daemon processes and restart them
# if they die due to an error signal.