Merge lp:~corey.bryant/nova/2014.2.2-0ubuntu2 into lp:~ubuntu-server-dev/nova/juno

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-11 19:00:15 +0000
+++ debian/changelog	2015-03-29 19:09:33 +0000
@@ -1,3 +1,10 @@
+nova (1:2014.2.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  [ Edward Hope-Morley ]
+  * Fixed race between nova-compute and neutron-ovs-cleanup (LP: #1420572)
+
+ -- Corey Bryant <[e-mail]>  Sun, 29 Mar 2015 11:19:09 -0400
+
 nova (1:2014.2.2-0ubuntu1) utopic; urgency=medium
 
   [ Corey Bryant ]

=== modified file 'debian/nova-compute.upstart'
--- debian/nova-compute.upstart	2013-12-12 14:40:38 +0000
+++ debian/nova-compute.upstart	2015-03-29 19:09:33 +0000
@@ -20,6 +20,12 @@
   if status libvirt-bin; then
     start wait-for-state WAIT_FOR=libvirt-bin WAIT_STATE=running WAITER=nova-compute
   fi
+
+  # 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=nova-compute
+  fi
 end script
 
 exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-compute -- --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf