Added separate package for neutron-ovs-cleanup according to OSCI-844

[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 a114e779f2f0baa1e7e3a71de80f5e93af4c017f..4cc3ebec721933817ea90133c3ab19fb19540800 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 runlevel [2345]
+start on neutron-ovs-cleanup or runlevel [2345]
 stop on runlevel [!2345]
 
 respawn
@@ -10,11 +10,6 @@ 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