Added code for guessing the plugin config file to load in neutron-server upstart...

diff --git a/debian/neutron-server.upstart.in b/debian/neutron-server.upstart.in
index 4d1f54314ceb4b2e54751a279e88a48c72bbd3a8..d4b62a1aa01ed8f6701fcf4ffab5904c58e92c89 100644 (file)
--- a/debian/neutron-server.upstart.in
+++ b/debian/neutron-server.upstart.in
@@ -1,5 +1,5 @@
 description "Neutron server"
-author "Chuck Short <zulcss@ubuntu.com>"
+author "Thomas Goirand <zigo@debian.org>"
 
 start on runlevel [2345]
 stop on runlevel [016]
@@ -12,7 +12,21 @@ pre-start script
 end script
 
 script
-        [ -r /etc/default/neutron-server ] && . /etc/default/neutron-server
+       [ -x /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"
         exec start-stop-daemon --start --chuid neutron:neutron --exec /usr/bin/neutron-server -- \
             --config-file /etc/neutron/neutron.conf \