diff -Nru nova-2014.2.1/debian/changelog nova-2014.2.1/debian/changelog
--- nova-2014.2.1/debian/changelog	2014-12-15 10:11:17.000000000 +0000
+++ nova-2014.2.1/debian/changelog	2015-02-19 15:22:56.000000000 +0000
@@ -1,3 +1,10 @@
+nova (1:2014.2.1-0ubuntu1~cloud1) trusty-juno; urgency=medium
+
+  [ Edward Hope-Morley ]
+  * Fixed race between nova-compute and neutron-ovs-cleanup (LP: #1420572)
+
+ -- Edward Hope-Morley <edward.hope-morley@canonical.com>  Thu, 19 Feb 2015 15:21:36 +0000
+
 nova (1:2014.2.1-0ubuntu1~cloud0) trusty-juno; urgency=medium
 
   * New upstream release for the Ubuntu Cloud Archive.
diff -Nru nova-2014.2.1/debian/nova-compute.upstart nova-2014.2.1/debian/nova-compute.upstart
--- nova-2014.2.1/debian/nova-compute.upstart	2014-12-08 18:18:38.000000000 +0000
+++ nova-2014.2.1/debian/nova-compute.upstart	2015-02-19 15:20:35.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