OpenStack Compute (nova)

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

  1. 2014.1.4-0ubuntu2
  2. Merge into icehouse
Proposed by Corey Bryant
Status: Merged
Merged at revision: 701
Proposed branch: lp:~corey.bryant/nova/2014.1.4-0ubuntu2
Merge into: lp:~ubuntu-server-dev/nova/icehouse
Diff against target: 56 lines (+18/-2)
3 files modified
debian/changelog (+10/-0)
debian/control (+2/-2)
debian/nova-compute.upstart (+6/-0)
To merge this branch: bzr merge lp:~corey.bryant/nova/2014.1.4-0ubuntu2
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+254502@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-03-20 07:27:47 +0000
3+++ debian/changelog 2015-03-29 19:10:57 +0000
4@@ -1,3 +1,13 @@
5+nova (1:2014.1.4-0ubuntu2) UNRELEASED; urgency=medium
6+
7+ [ Edward Hope-Morley ]
8+ * Fixed race between nova-compute and neutron-ovs-cleanup (LP: #1420572)
9+
10+ [ Corey Bryant ]
11+ * d/control: Set minimum python-six dependency to 1.5.2 (LP: #1403114).
12+
13+ -- Corey Bryant <corey.bryant@canonical.com> Sun, 29 Mar 2015 11:00:09 -0400
14+
15 nova (1:2014.1.4-0ubuntu1) trusty; urgency=medium
16
17 * Resynchronize with stable/icehouse (cac6472) (LP: #1432608):
18
19=== modified file 'debian/control'
20--- debian/control 2014-06-24 14:58:36 +0000
21+++ debian/control 2015-03-29 19:10:57 +0000
22@@ -47,7 +47,7 @@
23 python-pycadf (>= 0.1.9),
24 python-routes,
25 python-setuptools,
26- python-six (>= 1.4.1),
27+ python-six (>= 1.5.2),
28 python-sphinx (>> 1.0),
29 python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy,
30 python-stevedore (>= 0.12),
31@@ -97,7 +97,7 @@
32 python-pycadf (>= 0.1.9),
33 python-routes,
34 python-simplejson,
35- python-six,
36+ python-six (>= 1.5.2),
37 python-sqlalchemy-ext ( >= 0.7.8-1~) | python-sqlalchemy (<< 0.6.3-2),
38 python-stevedore (>= 0.12),
39 python-suds,
40
41=== modified file 'debian/nova-compute.upstart'
42--- debian/nova-compute.upstart 2013-12-12 14:40:38 +0000
43+++ debian/nova-compute.upstart 2015-03-29 19:10:57 +0000
44@@ -20,6 +20,12 @@
45 if status libvirt-bin; then
46 start wait-for-state WAIT_FOR=libvirt-bin WAIT_STATE=running WAITER=nova-compute
47 fi
48+
49+ # Check to see if openvswitch plugin in use by checking
50+ # status of cleanup upstart configuration
51+ if status neutron-ovs-cleanup; then
52+ start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=nova-compute
53+ fi
54 end script
55
56 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

Subscribers

People subscribed via source and target branches