neutron

Merge lp:~james-page/neutron/version-depends into lp:~ubuntu-server-dev/neutron/havana

  1. version-depends
  2. Merge into havana
Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 189
Merged at revision: 188
Proposed branch: lp:~james-page/neutron/version-depends
Merge into: lp:~ubuntu-server-dev/neutron/havana
Diff against target: 235 lines (+41/-34)
13 files modified
debian/changelog (+6/-0)
debian/control (+17/-16)
debian/neutron-common.install (+8/-8)
debian/neutron-dhcp-agent.install (+1/-1)
debian/neutron-l3-agent.install (+1/-1)
debian/neutron-lbaas-agent.install (+1/-1)
debian/neutron-metadata-agent.install (+1/-1)
debian/neutron-plugin-hyperv.install (+1/-1)
debian/neutron-plugin-linuxbridge-agent.install (+1/-1)
debian/neutron-plugin-mlnx-agent.install (+1/-1)
debian/neutron-plugin-nec-agent.install (+1/-1)
debian/neutron-plugin-openvswitch-agent.install (+1/-1)
debian/neutron-plugin-ryu-agent.install (+1/-1)
To merge this branch: bzr merge lp:~james-page/neutron/version-depends
Reviewer Review Type Date Requested Status
James Page Needs Resubmitting
Review via email: mp+183855@code.launchpad.net

Description of the change

Fixup depends on oslo-config to ensure upgrade work OK.

To post a comment you must log in.
Revision history for this message
James Page (james-page) :
review: Needs Resubmitting

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-08-22 15:19:07 +0000
3+++ debian/changelog 2013-09-04 11:51:11 +0000
4@@ -19,6 +19,12 @@
5 update inline with upstream.
6 * d/rules: Ignore deprecated quantum binaries when checking for
7 missing files.
8+ * d/control: Update/add versioned depends for upgrades:
9+ - python-anyjson >= 0.3.3
10+ - python-stevedore >= 0.9
11+ - python-oslo.config >= 1:1.2.0
12+ - python-keystoneclient >= 1:0.2.0
13+ * d/*: Wrap and sort.
14
15 -- Chuck Short <zulcss@ubuntu.com> Wed, 31 Jul 2013 16:55:55 +0000
16
17
18=== modified file 'debian/control'
19--- debian/control 2013-08-02 14:14:14 +0000
20+++ debian/control 2013-09-04 11:51:11 +0000
21@@ -7,7 +7,7 @@
22 Build-Depends-Indep:
23 alembic (>= 0.4.1),
24 python-amqplib,
25- python-anyjson,
26+ python-anyjson (>= 0.3.3),
27 python-babel,
28 python-cliff,
29 python-configobj,
30@@ -24,20 +24,20 @@
31 python-mox,
32 python-netaddr,
33 python-netifaces,
34+ python-neutronclient (>= 1:2.2.3),
35 python-nose,
36 python-novaclient,
37- python-oslo.config,
38+ python-oslo.config (>= 1:1.2.0),
39+ python-paste,
40+ python-pastedeploy,
41 python-pbr,
42- python-paste,
43- python-pastedeploy,
44 python-pyudev,
45- python-neutronclient (>= 1:2.2.3),
46 python-routes,
47 python-setuptools,
48 python-setuptools-git,
49 python-simplejson,
50- python-stevedore (>= 0.8),
51 python-sqlalchemy,
52+ python-stevedore (>= 0.9),
53 python-testtools,
54 python-webob,
55 python-webtest,
56@@ -140,9 +140,9 @@
57 Package: neutron-plugin-nec-agent
58 Architecture: all
59 Depends:
60- openvswitch-switch,
61 neutron-common (= ${source:Version}),
62 neutron-plugin-nec,
63+ openvswitch-switch,
64 ${misc:Depends},
65 ${python:Depends},
66 ${shlibs:Depends}
67@@ -295,9 +295,9 @@
68 Package: neutron-l3-agent
69 Architecture: all
70 Depends:
71- neutron-common (= ${source:Version}),
72- neutron-metadata-agent (= ${source:Version}),
73 iputils-arping,
74+ neutron-common (= ${source:Version}),
75+ neutron-metadata-agent (= ${source:Version}),
76 ${misc:Depends},
77 ${python:Depends},
78 ${shlibs:Depends}
79@@ -387,24 +387,25 @@
80 Section: python
81 Depends:
82 python-amqplib,
83- python-anyjson,
84+ python-anyjson (>= 0.3.3),
85 python-configobj,
86 python-eventlet,
87 python-gflags,
88 python-httplib2,
89 python-iso8601,
90- python-keystone,
91+ python-keystoneclient (>= 1:0.2.0),
92 python-kombu (>= 2.5.12),
93 python-lxml,
94 python-netaddr,
95- python-paste,
96- python-pastedeploy,
97- python-pyudev,
98 python-neutronclient (>= 1:0.1.0.1-0ubuntu1),
99+ python-oslo.config (>= 1:1.2.0),
100+ python-paste,
101+ python-pastedeploy,
102+ python-pyudev,
103 python-routes,
104 python-simplejson,
105- python-stevedore (>= 0.8),
106 python-sqlalchemy,
107+ python-stevedore (>= 0.9),
108 python-webob,
109 ${misc:Depends},
110 ${python:Depends}
111@@ -449,9 +450,9 @@
112 Package: neutron-plugin-openvswitch-agent
113 Architecture: all
114 Depends:
115- openvswitch-switch,
116 neutron-common (= ${source:Version}),
117 neutron-plugin-openvswitch,
118+ openvswitch-switch,
119 ${misc:Depends},
120 ${python:Depends},
121 ${shlibs:Depends}
122
123=== modified file 'debian/neutron-common.install'
124--- debian/neutron-common.install 2013-08-23 13:03:11 +0000
125+++ debian/neutron-common.install 2013-09-04 11:51:11 +0000
126@@ -1,14 +1,14 @@
127+debian/neutron_sudoers etc/sudoers.d
128+etc/api-paste.ini etc/neutron
129+etc/neutron.conf etc/neutron
130+etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
131+etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
132+etc/policy.json etc/neutron
133+etc/rootwrap.conf etc/neutron
134 usr/bin/neutron-db-manage usr/bin
135-usr/bin/neutron-usage-audit usr/bin
136 usr/bin/neutron-debug usr/bin
137 usr/bin/neutron-netns-cleanup usr/bin
138 usr/bin/neutron-ovs-cleanup usr/bin
139 usr/bin/neutron-rootwrap usr/bin
140 usr/bin/neutron-rootwrap-xen-dom0 usr/bin
141-debian/neutron_sudoers etc/sudoers.d
142-etc/api-paste.ini etc/neutron
143-etc/policy.json etc/neutron
144-etc/neutron.conf etc/neutron
145-etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
146-etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
147-etc/rootwrap.conf etc/neutron
148+usr/bin/neutron-usage-audit usr/bin
149
150=== modified file 'debian/neutron-dhcp-agent.install'
151--- debian/neutron-dhcp-agent.install 2013-08-15 09:02:15 +0000
152+++ debian/neutron-dhcp-agent.install 2013-09-04 11:51:11 +0000
153@@ -1,4 +1,4 @@
154-usr/bin/neutron-dhcp-agent usr/bin
155 debian/cron.d/neutron-dhcp-agent-netns-cleanup etc/cron.d
156 etc/dhcp_agent.ini etc/neutron
157 etc/neutron/rootwrap.d/dhcp.filters etc/neutron/rootwrap.d
158+usr/bin/neutron-dhcp-agent usr/bin
159
160=== modified file 'debian/neutron-l3-agent.install'
161--- debian/neutron-l3-agent.install 2013-07-15 17:45:17 +0000
162+++ debian/neutron-l3-agent.install 2013-09-04 11:51:11 +0000
163@@ -1,4 +1,4 @@
164-usr/bin/neutron-l3-agent usr/bin
165 debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
166 etc/l3_agent.ini etc/neutron
167 etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
168+usr/bin/neutron-l3-agent usr/bin
169
170=== modified file 'debian/neutron-lbaas-agent.install'
171--- debian/neutron-lbaas-agent.install 2013-07-15 17:45:17 +0000
172+++ debian/neutron-lbaas-agent.install 2013-09-04 11:51:11 +0000
173@@ -1,4 +1,4 @@
174-usr/bin/neutron-lbaas-agent usr/bin
175 debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d
176 etc/lbaas_agent.ini etc/neutron
177 etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d
178+usr/bin/neutron-lbaas-agent usr/bin
179
180=== modified file 'debian/neutron-metadata-agent.install'
181--- debian/neutron-metadata-agent.install 2013-07-15 17:45:17 +0000
182+++ debian/neutron-metadata-agent.install 2013-09-04 11:51:11 +0000
183@@ -1,3 +1,3 @@
184+etc/metadata_agent.ini etc/neutron
185 usr/bin/neutron-metadata-agent usr/bin
186 usr/bin/neutron-ns-metadata-proxy usr/bin
187-etc/metadata_agent.ini etc/neutron
188
189=== modified file 'debian/neutron-plugin-hyperv.install'
190--- debian/neutron-plugin-hyperv.install 2013-07-16 22:31:35 +0000
191+++ debian/neutron-plugin-hyperv.install 2013-09-04 11:51:11 +0000
192@@ -1,2 +1,2 @@
193+etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv
194 usr/bin/neutron-hyperv-agent usr/bin
195-etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv
196
197=== modified file 'debian/neutron-plugin-linuxbridge-agent.install'
198--- debian/neutron-plugin-linuxbridge-agent.install 2013-07-15 17:45:17 +0000
199+++ debian/neutron-plugin-linuxbridge-agent.install 2013-09-04 11:51:11 +0000
200@@ -1,2 +1,2 @@
201+etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d
202 usr/bin/neutron-linuxbridge-agent usr/bin
203-etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d
204
205=== modified file 'debian/neutron-plugin-mlnx-agent.install'
206--- debian/neutron-plugin-mlnx-agent.install 2013-07-17 13:01:34 +0000
207+++ debian/neutron-plugin-mlnx-agent.install 2013-09-04 11:51:11 +0000
208@@ -1,2 +1,2 @@
209+etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx
210 usr/bin/neutron-mlnx-agent usr/bin
211-etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx
212
213=== modified file 'debian/neutron-plugin-nec-agent.install'
214--- debian/neutron-plugin-nec-agent.install 2013-07-15 17:45:17 +0000
215+++ debian/neutron-plugin-nec-agent.install 2013-09-04 11:51:11 +0000
216@@ -1,2 +1,2 @@
217+etc/neutron/rootwrap.d/nec-plugin.filters etc/neutron/rootwrap.d
218 usr/bin/neutron-nec-agent usr/bin
219-etc/neutron/rootwrap.d/nec-plugin.filters etc/neutron/rootwrap.d
220
221=== modified file 'debian/neutron-plugin-openvswitch-agent.install'
222--- debian/neutron-plugin-openvswitch-agent.install 2013-07-15 17:45:17 +0000
223+++ debian/neutron-plugin-openvswitch-agent.install 2013-09-04 11:51:11 +0000
224@@ -1,2 +1,2 @@
225+etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d
226 usr/bin/neutron-openvswitch-agent usr/bin
227-etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d
228
229=== modified file 'debian/neutron-plugin-ryu-agent.install'
230--- debian/neutron-plugin-ryu-agent.install 2013-07-15 17:45:17 +0000
231+++ debian/neutron-plugin-ryu-agent.install 2013-09-04 11:51:11 +0000
232@@ -1,2 +1,2 @@
233+etc/neutron/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d
234 usr/bin/neutron-ryu-agent usr/bin
235-etc/neutron/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d

Subscribers

People subscribed via source and target branches