diff options
author | Ben Pfaff <blp@nicira.com> | 2010-08-25 09:57:11 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-08-25 10:03:37 -0700 |
commit | 1f0af7586e9ffbdbafe00344aca56cd2663b1f62 (patch) | |
tree | 8d50904e562988acd6c5597b85c5038e2a3ecadd /debian | |
parent | 265fcdc746d62c9f84ebdaaa12b17c05bf80c546 (diff) |
utilities: Remove ovs-monitor.
The ovs-monitor script is now more than adequately replaced by the
--monitor option to the various daemons.
CC: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/.gitignore | 1 | ||||
-rw-r--r-- | debian/automake.mk | 4 | ||||
-rw-r--r-- | debian/control | 9 | ||||
-rw-r--r-- | debian/openvswitch-monitor.default | 28 | ||||
-rw-r--r-- | debian/openvswitch-monitor.dirs | 1 | ||||
-rwxr-xr-x | debian/openvswitch-monitor.init | 175 | ||||
-rw-r--r-- | debian/openvswitch-monitor.install | 1 |
7 files changed, 0 insertions, 219 deletions
diff --git a/debian/.gitignore b/debian/.gitignore index 345f3fec..aa8169b2 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -11,7 +11,6 @@ /openvswitch-controller /openvswitch-datapath-source /openvswitch-dbg -/openvswitch-monitor /openvswitch-pki /openvswitch-pki-server /openvswitch-switch diff --git a/debian/automake.mk b/debian/automake.mk index 682488a3..c8b791b4 100644 --- a/debian/automake.mk +++ b/debian/automake.mk @@ -23,10 +23,6 @@ EXTRA_DIST += \ debian/openvswitch-datapath-source.copyright \ debian/openvswitch-datapath-source.dirs \ debian/openvswitch-datapath-source.install \ - debian/openvswitch-monitor.default \ - debian/openvswitch-monitor.dirs \ - debian/openvswitch-monitor.init \ - debian/openvswitch-monitor.install \ debian/openvswitch-pki-server.apache2 \ debian/openvswitch-pki-server.dirs \ debian/openvswitch-pki-server.install \ diff --git a/debian/control b/debian/control index 9dfc4b57..32a8fca1 100644 --- a/debian/control +++ b/debian/control @@ -99,15 +99,6 @@ Description: Debug symbols for Open vSwitch packages packages. Install it to debug one of them or to examine a core dump produced by one of them. -Package: openvswitch-monitor -Architecture: any -Recommends: openvswitch-switch -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Monitor utility for Open vSwitch switches - The ovs-monitor utility included in this package monitors the - ovs-openflowd process and the kernel datapath. If either become - unresponsive, it reboots the machine. - Package: openvswitch-wdt Architecture: any Recommends: openvswitch-switch diff --git a/debian/openvswitch-monitor.default b/debian/openvswitch-monitor.default deleted file mode 100644 index e61e91e7..00000000 --- a/debian/openvswitch-monitor.default +++ /dev/null @@ -1,28 +0,0 @@ -# This is a POSIX shell fragment -*- sh -*- - -# To configure the Open vSwitch monitor package, modify the following. -# Afterward, the monitor will be configured automatically at boot time. -# It can be started immediately with -# /etc/init.d/openvswitch-monitor start - -# Defaults for initscript -# sourced by /etc/init.d/openvswitch-monitor -# installed at /etc/default/openvswitch-monitor by the maintainer scripts - -# THRESHOLD: The number of failed attempts the monitor should make until -# it reboots the system. A value of zero disables the monitor. -THRESHOLD=3 - -# INTERVAL: The number of seconds to wait between probing -# ovs-openflowd and the datapath. -INTERVAL=1 - -# LOG_FILE: File to log messages related to monitoring. -LOG_FILE="/var/log/openvswitch/ovs-monitor.log" - -# SWITCH_VCONN: The vconn used to connect to the switch -# (ovs-openflowd). The ovs-openflowd must be configured to listen to -# this vconn. The default here set is also listened to by default by -# the openvswitch-switch package, so ordinarily there is no need to -# modify this. -SWITCH_VCONN="/var/run/openvswitch/ovs-openflowd.mgmt" diff --git a/debian/openvswitch-monitor.dirs b/debian/openvswitch-monitor.dirs deleted file mode 100644 index 236670a2..00000000 --- a/debian/openvswitch-monitor.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/sbin diff --git a/debian/openvswitch-monitor.init b/debian/openvswitch-monitor.init deleted file mode 100755 index 62c0ac8f..00000000 --- a/debian/openvswitch-monitor.init +++ /dev/null @@ -1,175 +0,0 @@ -#!/bin/sh -# -# Example init.d script with LSB support. -# -# Please read this init.d carefully and modify the sections to -# adjust it to the program you want to run. -# -# Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs@debian.org> -# -# This is free software; you may redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, -# or (at your option) any later version. -# -# This is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -### BEGIN INIT INFO -# Provides: openvswitch-monitor -# Required-Start: $network $local_fs $remote_fs -# Required-Stop: $remote_fs -# Should-Start: $named $syslog openvswitch-switch -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Open vSwitch switch monitor -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -DAEMON=/usr/sbin/ovs-monitor -NAME=ovs-monitor -DESC="Open vSwitch switch monitor" - -PIDFILE=/var/run/openvswitch/$NAME.pid - -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -# Default options, these can be overriden by the information -# at /etc/default/openvswitch-monitor -DAEMON_OPTS="" # Additional options given to the daemon - -DODTIME=10 # Time to wait for the daemon to die, in seconds - # If this value is set too low you might not - # let some daemons to die gracefully and - # 'restart' will not work - -# Include defaults if available -default=/etc/default/openvswitch-monitor -if [ -f $default ] ; then - . $default -fi - -set -e - -running_pid() { -# Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - return 0 -} - -running() { -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - pid=`cat $PIDFILE` - running_pid $pid $DAEMON || return 1 - return 0 -} - -start_daemon() { -# Start the process using the wrapper - if test $THRESHOLD != 0; then - start-stop-daemon --start --quiet -m --background --pidfile $PIDFILE \ - --exec $DAEMON -- -c $THRESHOLD -i $INTERVAL -l $LOG_FILE \ - -s $SWITCH_VCONN $DAEMON_OPTS - fi - - # Wait up to 3 seconds for the daemon to start. - for i in 1 2 3; do - if running; then - break - fi - sleep 1 - done -} - -stop_daemon() { - start-stop-daemon -o --stop --pidfile $PIDFILE - rm $PIDFILE -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC " "$NAME" - # Check if it's running first - if running ; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - if start_daemon && running ; then - # It's ok, the daemon started and is running - log_end_msg 0 - else - # Either we could not start it or it is not running - # after we did - # NOTE: Some daemons might die some time after they start, - # this code does not try to detect this and might give - # a false positive (use 'status' for that) - log_end_msg 1 - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - if running ; then - # Only stop the daemon if we see it running - stop_daemon - log_end_msg $? - else - # If it's not running don't do anything - log_progress_msg "apparently not running" - log_end_msg 0 - exit 0 - fi - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - if running ; then - stop_daemon - # Wait some sensible amount, some daemons need this - [ -n "$DIETIME" ] && sleep $DIETIME - fi - start_daemon - running - log_end_msg $? - ;; - status) - log_daemon_msg "Checking status of $DESC" "$NAME" - if running ; then - log_progress_msg "running" - log_end_msg 0 - else - log_progress_msg "apparently not running" - log_end_msg 1 - exit 1 - fi - ;; - # Use this if the daemon cannot reload - reload) - log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon" - log_warning_msg "cannot re-read the config file (use restart)." - ;; - *) - N=/etc/init.d/openvswitch-monitor - echo "Usage: $N {start|stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/openvswitch-monitor.install b/debian/openvswitch-monitor.install deleted file mode 100644 index 9fc601a8..00000000 --- a/debian/openvswitch-monitor.install +++ /dev/null @@ -1 +0,0 @@ -utilities/ovs-monitor usr/sbin |