Merge lp:~gandelman-a/ubuntu/saucy/nova/depends into lp:~openstack-ubuntu-testing/nova/havana

Proposed by Adam Gandelman
Status: Merged
Approved by: Chuck Short
Approved revision: 581
Merged at revision: 577
Proposed branch: lp:~gandelman-a/ubuntu/saucy/nova/depends
Merge into: lp:~openstack-ubuntu-testing/nova/havana
Diff against target: 96 lines (+32/-4)
4 files modified
debian/changelog (+9/-2)
debian/control (+4/-2)
debian/patches/avoid_requirements_websockify.patch (+18/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/saucy/nova/depends
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers Pending
Review via email: mp+165524@code.launchpad.net

Description of the change

nova-manage is now just an entry point into the nova python package and requires that all dependencies listed in the nova's egg-info/requires.txt be satisfied. Since nova-manage comes as part of nova-common package, we need to make sure all of nova's requires.txt dependencies are satisfied or nova-manage will throw Exceptions and postinsts will fail:

* sets various dependency versions
* adds python-babel
* requirements.txt lists websockify, but the only package we ship that needs it is nova-novncproxy. Patch it out so it doesn't require moving to nova-common or python-nova becoming a global dependency pulled in by every package.

To post a comment you must log in.
581. By Adam Gandelman

changelog typo.

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 2013-05-19 21:54:04 +0000
3+++ debian/changelog 2013-05-24 03:03:27 +0000
4@@ -1,5 +1,6 @@
5-nova (1:2013.2.a732.g7063896-0ubuntu1) UNRELEASED; urgency=low
6+nova (1:2013.2.a732.g7063896-0ubuntu4) UNRELEASED; urgency=low
7
8+ [ Chuck Short ]
9 * New upstream version.
10 * debian/patches/avoid_setuptools_git_dependency.patch: Dropped
11 no longer needed.
12@@ -7,7 +8,13 @@
13 * debian/control: Drop pep8 dependency.
14 * debian/patches/fix-ubuntu-tests.patch: Dropped no longer needed.
15
16- -- Chuck Short <zulcss@ubuntu.com> Mon, 13 May 2013 11:37:26 -0500
17+ [ Adam Gandelman ]
18+ * debian/patches/avoid_requirements_websockify.patch: Remove websockify
19+ to avoid making it a dependency of every nova package.
20+ * debian/control: Add python-babel.
21+ * debian/control: Set min. version 0.7.6 on python-netaddr dependency.
22+
23+ -- Adam Gandelman <adamg@ubuntu.com> Thu, 23 May 2013 19:25:55 -0700
24
25 nova (1:2013.1-0ubuntu2) raring; urgency=low
26
27
28=== modified file 'debian/control'
29--- debian/control 2013-05-19 21:54:04 +0000
30+++ debian/control 2013-05-24 03:03:27 +0000
31@@ -10,6 +10,7 @@
32 Build-Depends-Indep: openssh-client,
33 openssl,
34 python-amqplib,
35+ python-babel,
36 python-boto,
37 python-carrot,
38 python-cheetah,
39@@ -27,7 +28,7 @@
40 python-lxml,
41 python-migrate,
42 python-mox,
43- python-netaddr,
44+ python-netaddr (>= 0.7.6),
45 python-novaclient (>= 1:2.9.0),
46 python-oslo-config,
47 python-paramiko,
48@@ -59,6 +60,7 @@
49 Section: python
50 Depends: openssh-client,
51 openssl,
52+ python-babel,
53 python-boto,
54 python-carrot,
55 python-cheetah,
56@@ -78,7 +80,7 @@
57 python-lxml,
58 python-m2crypto,
59 python-migrate,
60- python-netaddr,
61+ python-netaddr (>= 0.7.6),
62 python-novaclient (>= 1:2.9.0),
63 python-paste,
64 python-pastedeploy,
65
66=== added file 'debian/patches/avoid_requirements_websockify.patch'
67--- debian/patches/avoid_requirements_websockify.patch 1970-01-01 00:00:00 +0000
68+++ debian/patches/avoid_requirements_websockify.patch 2013-05-24 03:03:27 +0000
69@@ -0,0 +1,18 @@
70+From: Adam Gandelman <adamg@ubuntu.com>
71+Date: Thu May 23 19:45:33 PDT 2013
72+Subject: Avoid websockify in requirements.txt
73+
74+The only component that requires websockify is the nova-novncproxy
75+package, which pulls it in as a dependency. Leaving it in requirements.txt
76+would turn it into a dependency of python-nova or nova-common.
77+
78+Index: nova/requirements.txt
79+===================================================================
80+--- nova.orig/requirements.txt 2013-05-23 19:44:34.183145856 -0700
81++++ nova/requirements.txt 2013-05-23 19:44:43.327145520 -0700
82+@@ -29,5 +29,4 @@
83+ python-keystoneclient>=0.2.0
84+ six
85+ stevedore>=0.7
86+-websockify<0.4
87+ oslo.config>=1.1.0
88
89=== modified file 'debian/patches/series'
90--- debian/patches/series 2013-05-19 21:54:04 +0000
91+++ debian/patches/series 2013-05-24 03:03:27 +0000
92@@ -1,3 +1,4 @@
93 # Ubuntu specific patches below here. Note these can be dropped eventually.
94+avoid_requirements_websockify.patch
95 path-to-the-xenhost.conf-fixup.patch
96 fix-docs-build-without-network.patch

Subscribers

People subscribed via source and target branches