. /etc/xensource-inventory
test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
+NETWORK_MODE=$(cat /etc/xensource/network.conf)
+case $NETWORK_MODE in
+ vswitch|openvswitch)
+ ;;
+ bridge)
+ exit 0
+ ;;
+ *)
+ echo "Open vSwitch disabled (/etc/xensource/network.conf is invalid)" >&2
+ exit 0
+ ;;
+esac
+
# General config variables in /etc/sysconfig/openvswitch
if test "$PRODUCT_VERSION" = "5.5.0"; then
# XenServer 5.5.0 needs ovs-brcompatd and /proc/net simulation.
: ${BRCOMPATD_VALGRIND_LOG:=}
: ${BRCOMPATD_VALGRIND_OPT:=}
-# Config variables specific to ovs-xenserverd
-: ${XENSERVERD_PIDFILE:=/var/run/openvswitch/ovs-xenserverd.pid}
-: ${XENSERVERD_RUN_DIR:=/var/xen/openvswitch}
-
# Full paths to executables & modules
ovsdb_server="/usr/sbin/ovsdb-server"
ovsdb_tool="/usr/bin/ovsdb-tool"
vswitchd="/usr/sbin/ovs-vswitchd"
brcompatd="/usr/sbin/ovs-brcompatd"
-xenserverd="/usr/sbin/ovs-xenserverd"
dpctl="/usr/bin/ovs-dpctl"
appctl="/usr/bin/ovs-appctl"
ofctl="/usr/bin/ovs-ofctl"
if [ "$ENABLE_BRCOMPAT" = "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/extra/openvswitch/veth_mod.ko" ] && ! lsmod | grep -q "veth_mod"; then
- action "Inserting veth module" modprobe veth_mod
- fi
}
function remove_modules {
fi
}
-function start_ovsdb_server {
- local syslog_opt="-vANY:SYSLOG:${OVSDB_SERVER_SYSLOG_LOGLEVEL}"
- local logfile_file_opt=""
- local logfile_level_opt=""
- if [ ! -d "$OVSDB_SERVER_RUN_DIR" ]; then
- install -d -m 755 -o root -g root "$OVSDB_SERVER_RUN_DIR"
- fi
- cd "$OVSDB_SERVER_RUN_DIR"
- local remotes=
- for remote in $OVSDB_SERVER_REMOTES; do
- remotes="$remotes --remote=$remote"
- done
-
- install -d -m 755 -o root -g root `dirname $OVSDB_SERVER_LOGFILE`
- if [ -n "$OVSDB_SERVER_FILE_LOGLEVEL" ]; then
- logfile_level_opt="-vANY:FILE:${OVSDB_SERVER_FILE_LOGLEVEL}"
- logfile_file_opt="--log-file=$OVSDB_SERVER_LOGFILE"
- fi
-
- local leak_opt=""
- if [ -n "$OVSDB_SERVER_MEMLEAK_LOGFILE" ]; then
- leak_opt="--check-leaks=$OVSDB_SERVER_MEMLEAK_LOGFILE"
- if [ -e "$OVSDB_SERVER_MEMLEAK_LOGFILE" ]; then
- mv "$OVSDB_SERVER_MEMLEAK_LOGFILE" "$OVSDB_SERVER_MEMLEAK_LOGFILE.prev"
+function start_daemon {
+ local DAEMON=$1
+ shift
+ local BINARY=$1
+
+ # cd to daemon's run_dir so core files get dumped into a sensible place.
+ eval local run_dir=\$${DAEMON}_RUN_DIR
+ if [ ! -d "$run_dir" ]; then
+ install -d -m 755 -o root -g root "$run_dir"
+ fi
+ cd "$run_dir"
+
+ # Configure log levels.
+ eval local syslog_loglevel=\$${DAEMON}_SYSLOG_LOGLEVEL
+ eval local file_loglevel=\$${DAEMON}_FILE_LOGLEVEL
+ eval local logfile=\$${DAEMON}_LOGFILE
+ set -- "$@" -vANY:CONSOLE:EMER -vANY:SYSLOG:"$syslog_loglevel"
+ if test -n "$file_loglevel" && test -n "$logfile"; then
+ install -d -m 755 -o root -g root `dirname "$logfile"`
+ set -- "$@" --log-file="$logfile" -vANY:FILE:"$file_loglevel"
+ fi
+
+ # Configure leak checker.
+ eval local memleak_logfile=\$${DAEMON}_MEMLEAK_LOGFILE
+ if test -n "$memleak_logfile"; then
+ set -- "$@" --check-leaks="$memleak_logfile"
+ if test -e "$memleak_logfile"; then
+ mv "$memleak_logfile" "$memleak_logfile.prev"
fi
fi
- local strace_opt=""
- local daemonize="y"
- if [ -n "$OVSDB_SERVER_STRACE_LOG" ] && [ -n "$OVSDB_SERVER_VALGRIND_LOG" ]; then
- printf "Can not start with both VALGRIND and STRACE\n"
- exit 1
- fi
- if [ -n "$OVSDB_SERVER_STRACE_LOG" ]; then
- strace_opt="strace -o $OVSDB_SERVER_STRACE_LOG $OVSDB_SERVER_STRACE_OPT"
- daemonize="n"
- fi
- if [ -n "$OVSDB_SERVER_VALGRIND_LOG" ]; then
- valgrind_opt="valgrind --log-file=$OVSDB_SERVER_VALGRIND_LOG $OVSDB_SERVER_VALGRIND_OPT"
- daemonize="n"
- fi
- ssl_opts="--private-key=db:SSL,private_key --certificate=db:SSL,certificate --bootstrap-ca-cert=db:SSL,ca_cert"
- install -d -m 755 -o root -g root `dirname $OVSDB_SERVER_PIDFILE`
- if [ "$daemonize" != "y" ]; then
- # Start in background and force a "success" message
- action "Starting ovsdb_server ($strace_opt$valgrind_opt)" true
- (nice -n "$OVSDB_SERVER_PRIORITY" $strace_opt $valgrind_opt "$ovsdb_server" "$OVSDB_SERVER_DB" --pidfile="$OVSDB_SERVER_PIDFILE" --detach $monitor_opt --no-chdir -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt $remotes $ssl_opts) &
- else
- action "Starting ovsdb-server" nice -n "$OVSDB_SERVER_PRIORITY" "$ovsdb_server" "$OVSDB_SERVER_DB" --pidfile="$OVSDB_SERVER_PIDFILE" --detach $monitor_opt --no-chdir -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt $remotes $ssl_opts
- fi
-}
-
-function start_vswitchd {
- local syslog_opt="-vANY:SYSLOG:${VSWITCHD_SYSLOG_LOGLEVEL}"
- local logfile_file_opt=""
- local logfile_level_opt=""
- if [ ! -d "$VSWITCHD_RUN_DIR" ]; then
- install -d -m 755 -o root -g root "$VSWITCHD_RUN_DIR"
- fi
- cd "$VSWITCHD_RUN_DIR"
-
- install -d -m 755 -o root -g root `dirname $VSWITCHD_LOGFILE`
- if [ -n "$VSWITCHD_FILE_LOGLEVEL" ]; then
- logfile_level_opt="-vANY:FILE:${VSWITCHD_FILE_LOGLEVEL}"
- logfile_file_opt="--log-file=$VSWITCHD_LOGFILE"
- fi
- local leak_opt=""
- if [ -n "$VSWITCHD_MEMLEAK_LOGFILE" ]; then
- leak_opt="--check-leaks=$VSWITCHD_MEMLEAK_LOGFILE"
- if [ -e "$VSWITCHD_MEMLEAK_LOGFILE" ]; then
- mv "$VSWITCHD_MEMLEAK_LOGFILE" "$VSWITCHD_MEMLEAK_LOGFILE.prev"
- fi
- fi
- local strace_opt=""
- local daemonize="y"
- if [ -n "$VSWITCHD_STRACE_LOG" ] && [ -n "$VSWITCHD_VALGRIND_LOG" ]; then
+ # Configure debugging wrappers.
+ eval local strace_log=\$${DAEMON}_STRACE_LOG
+ eval local strace_opt=\$${DAEMON}_STRACE_OPT
+ eval local valgrind_log=\$${DAEMON}_VALGRIND_LOG
+ eval local valgrind_opt=\$${DAEMON}_VALGRIND_OPT
+ if test -n "$strace_log" && test -n "$valgrind_log"; then
printf "Can not start with both VALGRIND and STRACE\n"
exit 1
- fi
- if [ -n "$VSWITCHD_STRACE_LOG" ]; then
- strace_opt="strace -o $VSWITCHD_STRACE_LOG $VSWITCHD_STRACE_OPT"
- daemonize="n"
- fi
- if [ -n "$VSWITCHD_VALGRIND_LOG" ]; then
- valgrind_opt="valgrind --log-file=$VSWITCHD_VALGRIND_LOG $VSWITCHD_VALGRIND_OPT"
- daemonize="n"
- fi
- local fake_proc_net_opt=""
- if [ "$ENABLE_FAKE_PROC_NET" = "y" ]; then
- fake_proc_net_opt="--fake-proc-net"
- fi
- if [ "$VSWITCHD_MLOCKALL" != "no" ]; then
- mlockall_opt="--mlockall"
- fi
-
- install -d -m 755 -o root -g root `dirname $VSWITCHD_PIDFILE`
- if [ "$daemonize" != "y" ]; then
- # Start in background and force a "success" message
- action "Starting ovs-vswitchd ($strace_opt$valgrind_opt)" true
- (nice -n "$VSWITCHD_PRIORITY" $strace_opt $valgrind_opt "$vswitchd" --pidfile="$VSWITCHD_PIDFILE" --detach $monitor_opt --no-chdir $fake_proc_net_opt -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt $mlockall_opt "$VSWITCHD_OVSDB_SERVER") &
+ elif test -n "$strace_log"; then
+ local mode=strace
+ set -- strace -o "$strace_log" $strace_opt "$@"
+ elif test -n "$valgrind_log"; then
+ local mode=valgrind
+ set -- valgrind --log-file="$valgrind_log" $valgrind_opt "$@"
else
- action "Starting ovs-vswitchd" nice -n "$VSWITCHD_PRIORITY" "$vswitchd" --pidfile="$VSWITCHD_PIDFILE" --detach $monitor_opt --no-chdir $fake_proc_net_opt -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt $mlockall_opt "$VSWITCHD_OVSDB_SERVER"
- fi
-}
-
-function start_brcompatd {
- local syslog_opt="-vANY:SYSLOG:${BRCOMPATD_SYSLOG_LOGLEVEL}"
- local logfile_file_opt=""
- local logfile_level_opt=""
- if [ ! -d "$BRCOMPATD_RUN_DIR" ]; then
- install -d -m 755 -o root -g root "$BRCOMPATD_RUN_DIR"
+ local mode=production
+ eval local pidfile=\$${DAEMON}_PIDFILE
+ install -d -m 755 -o root -g root `dirname $pidfile`
+ set -- "$@" --pidfile="$pidfile" --detach $monitor_opt --no-chdir
fi
- cd "$BRCOMPATD_RUN_DIR"
- install -d -m 755 -o root -g root `dirname $BRCOMPATD_LOGFILE`
- if [ -n "$BRCOMPATD_FILE_LOGLEVEL" ]; then
- logfile_level_opt="-vANY:FILE:${BRCOMPATD_FILE_LOGLEVEL}"
- logfile_file_opt="--log-file=$BRCOMPATD_LOGFILE"
+ # Configure niceness.
+ eval local priority=\$${DAEMON}_PRIORITY
+ if test -n "$priority"; then
+ set -- nice -n $priority "$@"
fi
- local leak_opt=""
- if [ -n "$BRCOMPATD_MEMLEAK_LOGFILE" ]; then
- leak_opt="--check-leaks=$BRCOMPATD_MEMLEAK_LOGFILE"
- if [ -e "$BRCOMPATD_MEMLEAK_LOGFILE" ]; then
- mv "$BRCOMPATD_MEMLEAK_LOGFILE" "$BRCOMPATD_MEMLEAK_LOGFILE.prev"
- fi
- fi
- local strace_opt=""
- local daemonize="y"
- if [ -n "$BRCOMPATD_STRACE_LOG" ] && [ -n "$BRCOMPATD_VALGRIND_LOG" ]; then
- printf "Can not start with both VALGRIND and STRACE\n"
- exit 1
- fi
- if [ -n "$BRCOMPATD_STRACE_LOG" ]; then
- strace_opt="strace -o $BRCOMPATD_STRACE_LOG $BRCOMPATD_STRACE_OPT"
- daemonize="n"
- fi
- if [ -n "$VALGRIND_LOG" ]; then
- valgrind_opt="valgrind --log-file=$BRCOMPATD_VALGRIND_LOG $BRCOMPATD_VALGRIND_OPT"
- daemonize="n"
- fi
- appctl_cmd="$appctl --target=/var/run/openvswitch/ovs-vswitchd.\`cat $VSWITCHD_PIDFILE\`.ctl %s"
-
- install -d -m 755 -o root -g root `dirname $BRCOMPATD_PIDFILE`
- if [ "$daemonize" != "y" ]; then
- # Start in background and force a "success" message
- action "Starting ovs-brcompatd ($strace_opt$valgrind_opt)" true
- (nice -n "$VSWITCHD_PRIORITY" $strace_opt $valgrind_opt "$brcompatd"--no-chdir --appctl-command="$appctl_cmd" --pidfile=$BRCOMPATD_PIDFILE -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_OVSDB_SERVER") &
+ if test $mode = production; then
+ action "Starting `basename $BINARY`" "$@"
else
- action "Starting ovs-brcompatd" nice -n "$BRCOMPATD_PRIORITY" $strace_opt $valgrind_opt "$brcompatd" --no-chdir --appctl-command="$appctl_cmd" --pidfile=$BRCOMPATD_PIDFILE --detach $monitor_opt -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_OVSDB_SERVER"
+ # Start in background and force a "success" message
+ action "Starting `basename $BINARY` with $mode debugging" true
+ ("$@") &
fi
}
-function start_xenserverd {
- if [ ! -d "$XENSERVERD_RUN_DIR" ]; then
- install -d -m 755 -o root -g root "$XENSERVERD_RUN_DIR"
- fi
- cd "$XENSERVERD_RUN_DIR"
-
- install -d -m 755 -o root -g root `dirname $XENSERVERD_PIDFILE`
- action "Starting ovs-xenserverd" "$xenserverd" --no-chdir --pidfile=$XENSERVERD_PIDFILE --detach $monitor_opt -vANY:CONSOLE:EMER
- fi
+function start_ovsdb_server {
+ set -- "$ovsdb_server" "$OVSDB_SERVER_DB"
+ for remote in $OVSDB_SERVER_REMOTES; do
+ set -- "$@" --remote="$remote"
+ done
+ set -- "$@" --private-key=db:SSL,private_key --certificate=db:SSL,certificate --bootstrap-ca-cert=db:SSL,ca_cert
+ start_daemon OVSDB_SERVER "$@"
}
-function stop_ovsdb_server {
- if [ -f "$OVSDB_SERVER_PIDFILE" ]; then
- local pid=$(cat "$OVSDB_SERVER_PIDFILE")
- action "Killing ovsdb-server ($pid)" kill -TERM $pid
- rm -f "$OVSDB_SERVER_PIDFILE"
+function start_vswitchd {
+ local fake_proc_net_opt=
+ if [ "$ENABLE_FAKE_PROC_NET" = "y" ]; then
+ fake_proc_net_opt="--fake-proc-net"
fi
-}
-function stop_vswitchd {
- if [ -f "$VSWITCHD_PIDFILE" ]; then
- local pid=$(cat "$VSWITCHD_PIDFILE")
- action "Killing ovs-vswitchd ($pid)" kill -TERM $pid
- rm -f "$VSWITCHD_PIDFILE"
+ local mlockall_opt=
+ if [ "$VSWITCHD_MLOCKALL" != "no" ]; then
+ mlockall_opt="--mlockall"
fi
-}
-function stop_brcompatd {
- if [ -f "$BRCOMPATD_PIDFILE" ]; then
- local pid=$(cat "$BRCOMPATD_PIDFILE")
- action "Killing ovs-brcompatd ($pid)" kill -TERM $pid
- rm -f "$BRCOMPATD_PIDFILE"
- fi
+ start_daemon VSWITCHD "$vswitchd" $fake_proc_net_opt $mlockall_opt \
+ "$VSWITCHD_OVSDB_SERVER"
+ }
+
+function start_brcompatd {
+ start_daemon BRCOMPATD "$brcompatd" \
+ --appctl-command="$appctl --target=/var/run/openvswitch/ovs-vswitchd.\`cat $VSWITCHD_PIDFILE\`.ctl %s" \
+ "$VSWITCHD_OVSDB_SERVER"
}
-function stop_xenserverd {
- if [ -f "$XENSERVERD_PIDFILE" ]; then
- local pid=$(cat "$XENSERVERD_PIDFILE")
- action "Killing ovs-xenserverd ($pid)" kill -TERM $pid
- rm -f "$XENSERVERD_PIDFILE"
+function stop_daemon {
+ local DAEMON=$1
+ local BINARY=$2
+ eval local pidfile=\$${DAEMON}_PIDFILE
+ if test -f "$pidfile"; then
+ local pid=$(cat "$pidfile")
+ action "Killing `basename $BINARY` ($pid)" kill $pid
+ for delay in .1 .25 .65 1 1 1 1; do
+ if kill -0 $pid >/dev/null 2>&1; then
+ sleep $delay
+ else
+ break
+ fi
+ done
+ rm -f "$pidfile"
fi
}
provided as a convenience for those situations in which it does work.
EOF
- read -s -r -n 1 -p "Countinue with restart (y/N): " response
+ read -s -r -n 1 -p "Continue with restart (y/N): " response
printf "\n"
case "$response" in
y|Y)
esac
}
-function set_system_uuid {
- if test -n "$INSTALLATION_UUID"; then
- action "Configuring Open vSwitch system UUID" true
- $vsctl --no-wait set Open_vSwitch . external-ids:system-uuid="$INSTALLATION_UUID"
+function set_system_ids {
+ if [ -f /etc/xensource-inventory ]; then
+ action "Configuring Open vSwitch system IDs" true
+ $vsctl --no-wait --timeout=5 set Open_vSwitch . \
+ external-ids:system-type="$PRODUCT_BRAND" \
+ external-ids:system-version="$PRODUCT_VERSION-$BUILD_NUMBER" \
+ external-ids:system-id="$INSTALLATION_UUID" \
+ external-ids:xs-system-uuid="$INSTALLATION_UUID"
else
- action "Configuring Open vSwitch system UUID" false
+ action "Configuring Open vSwitch system IDs" false
fi
}
fi
start_ovsdb_server
- $vsctl --no-wait init
+ $vsctl --no-wait --timeout=5 init
if [ ! -e /var/run/openvswitch.booted ]; then
touch /var/run/openvswitch.booted
for bridge in $($vsctl list-br); do
- $vsctl --no-wait del-br $bridge
+ $vsctl --no-wait --timeout=5 del-br $bridge
done
fi
- set_system_uuid
+ set_system_ids
start_vswitchd
if [ "${ENABLE_BRCOMPAT}" = "y" ] ; then
start_brcompatd
fi
- start_xenserverd
+
+ # Start daemon to monitor external ids
+ PYTHONPATH=/usr/share/openvswitch/python \
+ /usr/share/openvswitch/scripts/ovs-external-ids \
+ --pidfile --detach $monitor_opt "$VSWITCHD_OVSDB_SERVER"
+
touch /var/lock/subsys/openvswitch
}
function stop {
- stop_xenserverd
- stop_brcompatd
- stop_vswitchd
- stop_ovsdb_server
+ stop_daemon BRCOMPATD "$brcompatd"
+ stop_daemon VSWITCHD "$vswitchd"
+ stop_daemon OVSDB_SERVER "$ovsdb_server"
+ if [ -e /var/run/openvswitch/ovs-external-ids.pid ]; then
+ kill `cat /var/run/openvswitch/ovs-external-ids.pid`
+ fi
rm -f /var/lock/subsys/openvswitch
}
restart)
restart
;;
+ reload|force-reload)
+ # Nothing to do--ovs-vswitchd and ovsdb-server keep their configuration
+ # up-to-date all the time.
+ ;;
strace-vswitchd)
shift
strace -p $(cat "$VSWITCHD_PIDFILE") "$@"
status -p "$OVSDB_SERVER_PIDFILE" ovsdb-server &&
status -p "$VSWITCHD_PIDFILE" ovs-vswitchd &&
(test "$ENABLE_BRCOMPAT" != "y" ||
- status -p "$BRCOMPATD_PIDFILE" ovs-brcompatd) &&
- status -p "$XENSERVERD_PIDFILE" ovs-xenserverd
+ status -p "$BRCOMPATD_PIDFILE" ovs-brcompatd)
;;
version)
/usr/sbin/ovsdb-server -V
/usr/sbin/ovs-vswitchd -V
/usr/sbin/ovs-brcompatd -V
- /usr/sbin/ovs-xenserverd -V
;;
help)
- printf "openvswitch [start|stop|restart|unload|status|version]\n"
+ printf "openvswitch [start|stop|restart|reload|force-reload|status|version]\n"
;;
*)
printf "Unknown command: $1\n"
git://git.onelab.eu / sliver-openvswitch.git / blobdiff