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

Change-Id: I433f4cea9fa486e7e2e357a88fd4afee1cc38796

diff --git a/debian/control b/debian/control
index 96516cc49fcb0bf4837206a3113ea1c1d2c9d10f..52e97f9ed36425fd3c5d5d0c0234e8b147cff345 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -643,6 +643,17 @@ Description: Neutron is a virtual network service for Openstack - metering plugi
  .
  This package provides the metering plugin.
 
+Package: neutron-ovs-cleanup
+Architecture: all
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-ovs-cleanup ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-ovs-cleanup ( << 1:2013.2~b2-0ubuntu1~ )
+Description: This package provides OVS cleanup upstart script.
+
 Package: quantum-server
 Depends: neutron-server, ${misc:Depends}
 Architecture: all

diff --git a/debian/neutron-ovs-cleanup.upstart b/debian/neutron-ovs-cleanup.upstart
new file mode 100644 (file)
index 0000000..7ae53a1
--- /dev/null
+++ b/debian/neutron-ovs-cleanup.upstart
@@ -0,0 +1,20 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron OpenvSwitch cleanup"
+author "Andrey Korolev <akorolev@mirantis.com>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+emits neutron-ovs-cleanup
+
+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
+end script

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