Merge lp:~arges/nova/fix-lp907152-grizzly into lp:~ubuntu-server-dev/nova/grizzly

[Chris J Arges]

[James Page (james-page)]

Please could the indentation be fixed in the pre-start block please.

review: Needs Fixing

[lp:~arges/nova/fix-lp907152-grizzly]

586. By Chris J Arges on 2014-01-14

[ Jian Wen ]
d/nova-compute.upstart: If libvirt-bin is installed, then wait
for it to reach running state before starting nova-compute
(LP: #907152, #1190280)

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-17 21:10:11 +0000
+++ debian/changelog	2014-01-14 18:35:55 +0000
@@ -1,3 +1,12 @@
+nova (1:2013.1.4-0ubuntu1.1) raring-proposed; urgency=low
+
+  [ Jian Wen ]
+  * d/nova-compute.upstart: If libvirt-bin is installed, then wait
+    for it to reach running state before starting nova-compute
+    (LP: #907152, #1190280)
+
+ -- Chris J Arges <[e-mail]>  Thu, 09 Jan 2014 12:26:44 -0600
+
 nova (1:2013.1.4-0ubuntu1) raring-proposed; urgency=low
 
   * Resynchronize with stable/grizzly (0409a09) (LP: #1241202):
 
=== modified file 'debian/nova-compute.upstart'
--- debian/nova-compute.upstart	2012-12-06 17:46:39 +0000
+++ debian/nova-compute.upstart	2014-01-14 18:35:55 +0000
@@ -1,3 +1,4 @@
+# vim: set ft=upstart et ts=2:
 description "Nova compute worker"
 author "Soren Hansen <[e-mail]>"
 
@@ -15,6 +16,11 @@
 	chown nova:root /var/lock/nova/
 
 	modprobe nbd
+
+	# If libvirt-bin is installed, always wait for it to start first
+	if status libvirt-bin; then
+		start wait-for-state WAIT_FOR=libvirt-bin 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