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

Proposed by Chris J Arges on 2014-01-14
Status: Merged
Merged at revision: 637
Proposed branch: lp:~arges/nova/fix-lp907152-havana
Merge into: lp:~ubuntu-server-dev/nova/havana
Diff against target: 37 lines (+15/-0)
2 files modified
debian/changelog (+9/-0)
debian/nova-compute.upstart (+6/-0)
To merge this branch: bzr merge lp:~arges/nova/fix-lp907152-havana
Reviewer Review Type Date Requested Status
James Page 2014-01-14 Pending
Review via email: mp+201663@code.launchpad.net

This proposal supersedes a proposal from 2014-01-09.

To post a comment you must log in.
James Page (james-page) wrote : Posted in a previous version of this proposal

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

review: Needs Fixing
Chris J Arges (arges) wrote :

Resubmitted proposals with proper indentation.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-12-19 20:30:10 +0000
+++ debian/changelog 2014-01-14 19:50:31 +0000
@@ -1,3 +1,12 @@
1nova (1:2013.2.1-0ubuntu1.1) saucy-proposed; urgency=low
2
3 [ Jian Wen ]
4 * d/nova-compute.upstart: If libvirt-bin is installed, then wait
5 for it to reach running state before starting nova-compute
6 (LP: #907152, #1190280)
7
8 -- Chris J Arges <chris.j.arges@canonical.com> Thu, 09 Jan 2014 12:30:55 -0600
9
1nova (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low10nova (1:2013.2.1-0ubuntu1) saucy-proposed; urgency=low
211
3 * Resynchronize with stable/havana (a4ffc06) (LP: #1262788):12 * Resynchronize with stable/havana (a4ffc06) (LP: #1262788):
413
=== modified file 'debian/nova-compute.upstart'
--- debian/nova-compute.upstart 2012-12-06 17:46:39 +0000
+++ debian/nova-compute.upstart 2014-01-14 19:50:31 +0000
@@ -1,3 +1,4 @@
1# vim: set ft=upstart et ts=2:
1description "Nova compute worker"2description "Nova compute worker"
2author "Soren Hansen <soren@linux2go.dk>"3author "Soren Hansen <soren@linux2go.dk>"
34
@@ -15,6 +16,11 @@
15 chown nova:root /var/lock/nova/16 chown nova:root /var/lock/nova/
1617
17 modprobe nbd18 modprobe nbd
19
20 # If libvirt-bin is installed, always wait for it to start first
21 if status libvirt-bin; then
22 start wait-for-state WAIT_FOR=libvirt-bin WAIT_STATE=running WAITER=nova-compute
23 fi
18end script24end script
1925
20exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-compute -- --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf26exec start-stop-daemon --start --chuid nova --exec /usr/bin/nova-compute -- --config-file=/etc/nova/nova.conf --config-file=/etc/nova/nova-compute.conf

Subscribers

People subscribed via source and target branches