Adjust agents startup scripts

Rewritten-From: 1faa8525bbc101d72169c6ccf3c7e5c1ecd6107d

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 2205c71c9047dbbd10f98811d1694aa6331aa37b..5d2212ccc5284140809aeac0c2a5610c0756ddf4 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,8 +1,14 @@
 neutron (2:8.0.0~b2-4) UNRELEASED; urgency=medium
 
+  [ Thomas Goirand ]
   * Added a neutron-sriov-agent package.
 
- -- Thomas Goirand <zigo@debian.org>  Fri, 26 Feb 2016 21:53:13 +0800
+  [ Ivan Udovichenko]
+  * d/neutron-openvswitch-agent.upstart.in: Remove legacy custom Upstart script.
+  * d/neutron-linuxbridge-agent.init.in d/neutron-openvswitch-agent.init.in:
+      Add custom ML2 config files instead of the default one (LP#1527005).
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Fri, 26 Feb 2016 16:05:47 +0200
 
 neutron (2:8.0.0~b2-3) experimental; urgency=medium
 

diff --git a/xenial/debian/neutron-linuxbridge-agent.init.in b/xenial/debian/neutron-linuxbridge-agent.init.in
index da1fdb02a0151b774617505b90945ddea34480d9..a79ed95e9ef08daf899b084b167d8e4c0c950bd5 100644 (file)
--- a/xenial/debian/neutron-linuxbridge-agent.init.in
+++ b/xenial/debian/neutron-linuxbridge-agent.init.in
@@ -25,5 +25,5 @@ NAME=${PROJECT_NAME}-linuxbridge-agent
 # replaced by ml2 as core_plugin and lb as agent. Making ml2 mandatory
 # to use this agent
 
-DAEMON_ARGS="--config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"
+DAEMON_ARGS="--config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --config-file=/etc/neutron/plugins/ml2/linuxbridge_agent.ini"
 

diff --git a/xenial/debian/neutron-openvswitch-agent.init.in b/xenial/debian/neutron-openvswitch-agent.init.in
index bc6af291d3f3e40421c8c2481596af98e6c39f53..8577910ed48a56156f777ea7973be69d1ac061f7 100644 (file)
--- a/xenial/debian/neutron-openvswitch-agent.init.in
+++ b/xenial/debian/neutron-openvswitch-agent.init.in
@@ -21,4 +21,4 @@ CONFIG_FILE=/etc/neutron/plugins/ml2/openvswitch_agent.ini
 # Since Juno OVS plugin as been deprecated as core_plugin, it has been
 # replaced by ml2 as core_plugin and ovs as agent. Making ml2 mandatory
 # to use this agent
-DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"
+DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/openvswitch_agent.ini"

diff --git a/xenial/debian/neutron-openvswitch-agent.upstart.in b/xenial/debian/neutron-openvswitch-agent.upstart.in
deleted file mode 100644 (file)
index 256e9a5..0000000
--- a/xenial/debian/neutron-openvswitch-agent.upstart.in
+++ /dev/null
@@ -1,39 +0,0 @@
-description "Neutron openvswitch plugin agent"
-author "Thomas Goirand <zigo@debian.org>"
-
-start on runlevel [2345]
-stop on runlevel [016]
-
-chdir /var/run
-
-pre-start script
-       mkdir -p /var/run/neutron
-       chown neutron:root /var/run/neutron
-end script
-
-script
-       [ -r /usr/share/neutron-common/plugin_guess_func ] || exit 0
-       . /usr/share/neutron-common/plugin_guess_func
-
-       if ! [ -r /etc/neutron/neutron.conf ] ; then
-               echo "Cloud not read /etc/neutron/neutron.conf: exiting"
-               exit 0
-       fi
-       CURRENT_PLUGIN=`grep "^[ \t]*core_plugin[ \t]*=[ \t]*[._a-zA-Z0-9]*\$" /etc/neutron/neutron.conf | sed -e 's/^[ \t]*core_plugin[ \t]*=[ \t]*//'`
-       if [ -z "${CURRENT_PLUGIN}" ] ; then
-               echo "No core_plugin= value found: please set it and try again"
-               exit 0
-       fi
-
-       neutron_core_plugin_to_plugin_name ${CURRENT_PLUGIN}
-       neutron_plugin_ini_path ${NEUTRON_PLUGIN_NAME}
-       [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG"
-       [ -r /etc/default/openstack ] && . /etc/default/openstack
-       [ -r /etc/default/$UPSTART_JOB ] && . /etc/default/$UPSTART_JOB
-
-       [ "x$USE_SYSLOG" = "xyes" ] && DAEMON_ARGS="$DAEMON_ARGS --use-syslog"
-       [ "x$USE_LOGFILE" != "xno" ] && DAEMON_ARGS="$DAEMON_ARGS --log-file=/var/log/neutron/ovs-agent.log"
-       exec start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-openvswitch-agent -- \
-               --config-file=/etc/neutron/neutron.conf \
-               $CONF_ARG $DAEMON_ARGS
-end script