Merge lp:~james-page/neutron/vpn-ovs-cleanup into lp:~ubuntu-server-dev/neutron/icehouse

[James Page]

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-11 07:31:26 +0000
+++ debian/changelog	2014-04-13 20:01:22 +0000
@@ -1,3 +1,11 @@
+neutron (1:2014.1~rc2-0ubuntu4) UNRELEASED; urgency=medium
+
+  * d/neutron-vpn-agent.upstart: Wait for neutron-ovs-cleanup service to
+    start if installed to ensure that Open vSwitch state is cleaned up
+    on reboot (LP: #1307208). 
+
+ -- James Page <[e-mail]>  Sun, 13 Apr 2014 20:52:56 +0100
+
 neutron (1:2014.1~rc2-0ubuntu3) trusty; urgency=medium
 
   * Fix the Breaks/Replaces from the previous version, as they were 

=== modified file 'debian/neutron-vpn-agent.upstart'
--- debian/neutron-vpn-agent.upstart	2014-04-10 13:04:53 +0000
+++ debian/neutron-vpn-agent.upstart	2014-04-13 20:01:22 +0000
@@ -12,6 +12,11 @@
 pre-start script
   mkdir -p /var/run/neutron
   chown neutron:root /var/run/neutron
+  # Check to see if openvswitch plugin in use by checking
+  # status of cleanup upstart configuration
+  if status neutron-ovs-cleanup; then
+    start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-vpn-agent
+  fi
 end script
 
 exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \