Update specs to v. 2014.1.b3

[openstack-build/neutron-build.git] / debian / neutron-plugin-openvswitch-agent.upstart

diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart
index b87adac580ec73f74ca6dd3aa517b009c2633ec3..27fcfcf42d16940d46e5057bb52ed158e8f2e657 100644 (file)
--- a/debian/neutron-plugin-openvswitch-agent.upstart
+++ b/debian/neutron-plugin-openvswitch-agent.upstart
@@ -2,7 +2,7 @@
 description "Neutron OpenvSwitch Plugin Agent"
 author "Chuck Short <zulcss@ubuntu.com>"
 
-start on neutron-ovs-cleanup or runlevel [2345]
+start on runlevel [2345] and started neutron-ovs-cleanup
 stop on runlevel [!2345]
 
 respawn
@@ -14,4 +14,4 @@ pre-start script
   chown neutron:root /var/run/neutron
 end script
 
-exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/ovs-agent.log
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log