From 1475689dd3defad9814ed092f7d4481eadd8af6e Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Fri, 13 Nov 2015 12:39:57 +0100 Subject: [PATCH] Remove SysV init script for neutron-server The script has some issues, f.e. it does not read any plugin configuration file. I don't believe anyone relies on it these days. The only distro I could think of that could use it is Debian, but they have their own version of the script maintained independently. So it seems easier to remove it not to mislead users. Change-Id: Ice622402a6261cfed8a8b042d732f39e25aff77c --- etc/init.d/neutron-server | 68 --------------------------------------- setup.cfg | 1 - 2 files changed, 69 deletions(-) delete mode 100755 etc/init.d/neutron-server diff --git a/etc/init.d/neutron-server b/etc/init.d/neutron-server deleted file mode 100755 index 98e5da610..000000000 --- a/etc/init.d/neutron-server +++ /dev/null @@ -1,68 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: neutron-server -# Required-Start: $remote_fs $syslog -# Required-Stop: $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: neutron-server -# Description: Provides the Neutron networking service -### END INIT INFO - -set -e - -PIDFILE=/var/run/neutron/neutron-server.pid -LOGFILE=/var/log/neutron/neutron-server.log - -DAEMON=/usr/bin/neutron-server -DAEMON_ARGS="--log-file=$LOGFILE" -DAEMON_DIR=/var/run - -ENABLED=true - -if test -f /etc/default/neutron-server; then - . /etc/default/neutron-server -fi - -mkdir -p /var/run/neutron -mkdir -p /var/log/neutron - -. /lib/lsb/init-functions - -export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" -export TMPDIR=/var/lib/neutron/tmp - -if [ ! -x ${DAEMON} ] ; then - exit 0 -fi - -case "$1" in - start) - test "$ENABLED" = "true" || exit 0 - log_daemon_msg "Starting neutron server" "neutron-server" - start-stop-daemon -Sbmv --pidfile $PIDFILE --chdir $DAEMON_DIR --exec $DAEMON -- $DAEMON_ARGS - log_end_msg $? - ;; - stop) - test "$ENABLED" = "true" || exit 0 - log_daemon_msg "Stopping neutron server" "neutron-server" - start-stop-daemon --stop --oknodo --pidfile ${PIDFILE} - log_end_msg $? - ;; - restart|force-reload) - test "$ENABLED" = "true" || exit 1 - $0 stop - sleep 1 - $0 start - ;; - status) - test "$ENABLED" = "true" || exit 0 - status_of_proc -p $PIDFILE $DAEMON neutron-server && exit 0 || exit $? - ;; - *) - log_action_msg "Usage: /etc/init.d/neutron-server {start|stop|restart|force-reload|status}" - exit 1 - ;; -esac - -exit 0 diff --git a/setup.cfg b/setup.cfg index 3eb8e8fa2..d571d9002 100644 --- a/setup.cfg +++ b/setup.cfg @@ -41,7 +41,6 @@ data_files = etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d/openvswitch-plugin.filters - etc/init.d = etc/init.d/neutron-server etc/neutron/plugins/bigswitch = etc/neutron/plugins/bigswitch/restproxy.ini etc/neutron/plugins/bigswitch/ssl/ca_certs = -- 2.45.2