X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=debian%2Fneutron-plugin-openvswitch-agent.upstart;h=b87adac580ec73f74ca6dd3aa517b009c2633ec3;hb=2df1c8a14b8510fe0b4c03f121c49bfc1abf63a3;hp=a114e779f2f0baa1e7e3a71de80f5e93af4c017f;hpb=5e95776827f1117e2c0aa2110a3cb3df4c10f004;p=openstack-build%2Fneutron-build.git

diff --git a/debian/neutron-plugin-openvswitch-agent.upstart b/debian/neutron-plugin-openvswitch-agent.upstart
index a114e779f..b87adac58 100644
--- 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 runlevel [2345]
+start on neutron-ovs-cleanup or runlevel [2345]
 stop on runlevel [!2345]
 
 respawn
@@ -10,13 +10,8 @@ respawn
 chdir /var/run
 
 pre-start script
-  mkdir -p /var/run/neutron-ovs-cleanup
-  chown neutron:neutron /var/run/neutron-ovs-cleanup
-  mkdir -p /var/lock/neutron-ovs-cleanup
-  chown neutron:root /var/lock/neutron-ovs-cleanup
-  /usr/bin/neutron-ovs-cleanup --config-file=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/neutron-ovs-cleanup.log
   mkdir -p /var/run/neutron
   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/openvswitch-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/openvswitch/ovs_neutron_plugin.ini --log-file=/var/log/neutron/ovs-agent.log