diff -Nru nova-2015.1~b2/debian/changelog nova-2015.1~b2/debian/changelog
--- nova-2015.1~b2/debian/changelog	2015-02-16 15:06:32.000000000 +0000
+++ nova-2015.1~b2/debian/changelog	2015-02-23 16:27:27.000000000 +0000
@@ -1,3 +1,10 @@
+nova (1:2015.1~b2-0ubuntu3~cloud0hf.0) vivid; urgency=medium
+
+  [ Edward Hope-Morley ]
+  * Fixed race between nova-compute and neutron-ovs-cleanup (LP: #1420572)
+
+ -- Edward Hope-Morley <edward.hope-morley@canonical.com>  Mon, 23 Feb 2015 13:41:47 +0000
+
 nova (1:2015.1~b2-0ubuntu3~cloud0) trusty-kilo; urgency=medium
 
   * New upstream release for the Ubuntu Cloud Archive.
diff -Nru nova-2015.1~b2/debian/nova-compute.upstart.in nova-2015.1~b2/debian/nova-compute.upstart.in
--- nova-2015.1~b2/debian/nova-compute.upstart.in	2015-02-13 18:15:09.000000000 +0000
+++ nova-2015.1~b2/debian/nova-compute.upstart.in	2015-02-23 13:41:09.000000000 +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