Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/neutron: neutron-2013.1.9999.ebuild neutron-2012.2.4-r7.ebuild neutron-2013.1.3-r6.ebuild neutron-9999.ebuild ChangeLog neutron-2013.1.3-r5.ebuild neutron-2012.2.4-r6.ebuild
Date: Fri, 27 Sep 2013 00:41:34
Message-Id: 20130927004128.561AB2004C@flycatcher.gentoo.org
1 prometheanfire 13/09/27 00:41:28
2
3 Modified: neutron-2013.1.9999.ebuild neutron-9999.ebuild
4 ChangeLog
5 Added: neutron-2012.2.4-r7.ebuild
6 neutron-2013.1.3-r6.ebuild
7 Removed: neutron-2013.1.3-r5.ebuild
8 neutron-2012.2.4-r6.ebuild
9 Log:
10 new logdir, olso dep fix, /sbin/ip fix, initscript fix, bridge-utils dep fix
11
12 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
13
14 Revision Changes Path
15 1.10 sys-cluster/neutron/neutron-2013.1.9999.ebuild
16
17 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild?rev=1.10&view=markup
18 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild?rev=1.10&content-type=text/plain
19 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild?r1=1.9&r2=1.10
20
21 Index: neutron-2013.1.9999.ebuild
22 ===================================================================
23 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v
24 retrieving revision 1.9
25 retrieving revision 1.10
26 diff -u -r1.9 -r1.10
27 --- neutron-2013.1.9999.ebuild 13 Sep 2013 20:44:32 -0000 1.9
28 +++ neutron-2013.1.9999.ebuild 27 Sep 2013 00:41:28 -0000 1.10
29 @@ -1,6 +1,6 @@
30 # Copyright 1999-2013 Gentoo Foundation
31 # Distributed under the terms of the GNU General Public License v2
32 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.9 2013/09/13 20:44:32 prometheanfire Exp $
33 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.9999.ebuild,v 1.10 2013/09/27 00:41:28 prometheanfire Exp $
34
35 EAPI=5
36 PYTHON_COMPAT=( python2_7 )
37 @@ -61,7 +61,9 @@
38 <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
39 >=dev-python/webob-1.2[${PYTHON_USEDEP}]
40 >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
41 + <dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
42 virtual/python-argparse[${PYTHON_USEDEP}]
43 + net-misc/bridge-utils
44 net-misc/openvswitch
45 dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
46
47 @@ -81,11 +83,15 @@
48 use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
49 use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
50
51 - dodir /var/log/neutron
52 + diropts -m 750
53 + dodir /var/log/neutron /var/log/quantum
54 fowners neutron:neutron /var/log/neutron
55 keepdir /etc/quantum
56 insinto /etc/quantum
57
58 + #it's /bin/ip not /sbin/ip
59 + sed -i 's/sbin\/ip\,/bin\/ip\,/g' "etc/quantum/rootwrap.d/*"
60 +
61 doins "etc/api-paste.ini"
62 doins "etc/dhcp_agent.ini"
63 doins "etc/l3_agent.ini"
64
65
66
67 1.7 sys-cluster/neutron/neutron-9999.ebuild
68
69 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild?rev=1.7&view=markup
70 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild?rev=1.7&content-type=text/plain
71 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild?r1=1.6&r2=1.7
72
73 Index: neutron-9999.ebuild
74 ===================================================================
75 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v
76 retrieving revision 1.6
77 retrieving revision 1.7
78 diff -u -r1.6 -r1.7
79 --- neutron-9999.ebuild 12 Sep 2013 22:11:38 -0000 1.6
80 +++ neutron-9999.ebuild 27 Sep 2013 00:41:28 -0000 1.7
81 @@ -1,6 +1,6 @@
82 # Copyright 1999-2013 Gentoo Foundation
83 # Distributed under the terms of the GNU General Public License v2
84 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.6 2013/09/12 22:11:38 prometheanfire Exp $
85 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-9999.ebuild,v 1.7 2013/09/27 00:41:28 prometheanfire Exp $
86
87 EAPI=5
88 PYTHON_COMPAT=( python2_7 )
89 @@ -60,7 +60,9 @@
90 <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
91 >=dev-python/webob-1.2[${PYTHON_USEDEP}]
92 >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
93 + <dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
94 virtual/python-argparse[${PYTHON_USEDEP}]
95 + net-misc/bridge-utils
96 net-misc/openvswitch
97 dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
98
99 @@ -80,11 +82,15 @@
100 use metadata && dosym /etc/init.d/neutron /etc/init.d/neutron-metadata-agent
101 use openvswitch && dosym /etc/init.d/neutron /etc/init.d/neutron-openvswitch-agent
102
103 - dodir /var/log/neutron
104 + diropts -m 750
105 + dodir /var/log/neutron /var/log/quantum
106 fowners neutron:neutron /var/log/neutron
107 keepdir /etc/neutron
108 insinto /etc/neutron
109
110 + #it's /bin/ip not /sbin/ip
111 + sed -i 's/sbin\/ip\,/bin\/ip\,/g' "etc/quantum/rootwrap.d/*"
112 +
113 doins "etc/api-paste.ini"
114 doins "etc/dhcp_agent.ini"
115 doins "etc/l3_agent.ini"
116
117
118
119 1.11 sys-cluster/neutron/ChangeLog
120
121 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.11&view=markup
122 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.11&content-type=text/plain
123 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?r1=1.10&r2=1.11
124
125 Index: ChangeLog
126 ===================================================================
127 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v
128 retrieving revision 1.10
129 retrieving revision 1.11
130 diff -u -r1.10 -r1.11
131 --- ChangeLog 13 Sep 2013 20:44:32 -0000 1.10
132 +++ ChangeLog 27 Sep 2013 00:41:28 -0000 1.11
133 @@ -1,6 +1,15 @@
134 # ChangeLog for sys-cluster/neutron
135 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
136 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.10 2013/09/13 20:44:32 prometheanfire Exp $
137 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.11 2013/09/27 00:41:28 prometheanfire Exp $
138 +
139 +*neutron-2013.1.3-r6 (27 Sep 2013)
140 +*neutron-2012.2.4-r7 (27 Sep 2013)
141 +
142 + 27 Sep 2013; Matthew Thode <prometheanfire@g.o>
143 + +neutron-2012.2.4-r7.ebuild, +neutron-2013.1.3-r6.ebuild,
144 + -neutron-2012.2.4-r6.ebuild, -neutron-2013.1.3-r5.ebuild, files/neutron-initd,
145 + neutron-2013.1.9999.ebuild, neutron-9999.ebuild:
146 + new logdir, olso dep fix, /sbin/ip fix, initscript fix, bridge-utils dep fix
147
148 *neutron-2013.1.3-r5 (13 Sep 2013)
149 *neutron-2012.2.4-r6 (13 Sep 2013)
150
151
152
153 1.1 sys-cluster/neutron/neutron-2012.2.4-r7.ebuild
154
155 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r7.ebuild?rev=1.1&view=markup
156 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r7.ebuild?rev=1.1&content-type=text/plain
157
158 Index: neutron-2012.2.4-r7.ebuild
159 ===================================================================
160 # Copyright 1999-2013 Gentoo Foundation
161 # Distributed under the terms of the GNU General Public License v2
162 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2012.2.4-r7.ebuild,v 1.1 2013/09/27 00:41:28 prometheanfire Exp $
163
164 EAPI=5
165 PYTHON_COMPAT=( python2_7 )
166
167 inherit distutils-r1 eutils
168
169 #restricted due to packages missing and bad depends in the test ==webob-1.0.8
170 RESTRICT="test"
171 DESCRIPTION="Quantum is a virtual network service for Openstack."
172 HOMEPAGE="https://launchpad.net/neutron"
173 SRC_URI="http://launchpad.net/${PN}/folsom/${PV}/+download/quantum-${PV}.tar.gz"
174 S="${WORKDIR}/quantum-${PV}"
175
176 LICENSE="Apache-2.0"
177 SLOT="0"
178 KEYWORDS="~amd64 ~x86"
179 IUSE="+dhcp +l3 +metadata +openvswitch +server test sqlite mysql postgres"
180 REQUIRED_USE="|| ( mysql postgres sqlite )"
181
182 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
183 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
184 app-admin/sudo
185 test? ( dev-python/cliff[${PYTHON_USEDEP}]
186 dev-python/configobj[${PYTHON_USEDEP}]
187 dev-python/coverage[${PYTHON_USEDEP}]
188 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
189 ~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
190 dev-python/nose[${PYTHON_USEDEP}]
191 dev-python/nosehtmloutput[${PYTHON_USEDEP}]
192 dev-python/nosexcover[${PYTHON_USEDEP}]
193 dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
194 ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
195 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
196 ~dev-python/webtest-1.3.3[${PYTHON_USEDEP}]
197 virtual/python-unittest2[${PYTHON_USEDEP}] )"
198 RDEPEND="=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
199 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
200 ~dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
201 ~dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
202 >=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
203 >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
204 dev-python/httplib2[${PYTHON_USEDEP}]
205 >=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
206 ~dev-python/kombu-1.0.4[${PYTHON_USEDEP}]
207 dev-python/lxml[${PYTHON_USEDEP}]
208 dev-python/netaddr[${PYTHON_USEDEP}]
209 >=dev-python/python-neutronclient-2.0[${PYTHON_USEDEP}]
210 dev-python/pyudev[${PYTHON_USEDEP}]
211 sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
212 <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
213 mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
214 <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
215 postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
216 <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
217 ~dev-python/webob-1.0.8[${PYTHON_USEDEP}]
218 net-misc/openvswitch
219 net-misc/bridge-utils
220 dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
221
222 pkg_setup() {
223 enewgroup neutron
224 enewuser neutron -1 -1 /var/lib/neutron neutron
225 }
226
227 python_install() {
228 distutils-r1_python_install
229 newconfd "${FILESDIR}/neutron-confd" "quantum"
230 newinitd "${FILESDIR}/neutron-initd" "quantum"
231
232 use server && dosym /etc/init.d/quantum /etc/init.d/quantum-server
233 use dhcp && dosym /etc/init.d/quantum /etc/init.d/quantum-dhcp-agent
234 use l3 && dosym /etc/init.d/quantum /etc/init.d/quantum-l3-agent
235 use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
236 use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
237
238 diropts -m 750
239 dodir /var/log/neutron /var/log/quantum
240 fowners neutron:neutron /var/log/neutron
241 keepdir /etc/quantum
242 insinto /etc/quantum
243
244 #it's /bin/ip not /sbin/ip
245 sed -i 's/sbin\/ip\,/bin\/ip\,/g' "etc/quantum/rootwrap.d/*"
246
247 doins "etc/api-paste.ini"
248 doins "etc/dhcp_agent.ini"
249 doins "etc/l3_agent.ini"
250 doins "etc/policy.json"
251 doins "etc/quantum.conf"
252 doins "etc/rootwrap.conf"
253 insinto /etc
254 doins -r "etc/quantum/"
255
256 #remove the etc stuff from usr...
257 rm -R "${D}/usr/etc/"
258
259 #add sudoers definitions for user neutron
260 insinto /etc/sudoers.d/
261 doins "${FILESDIR}/neutron-sudoers"
262 }
263
264 pkg_config() {
265 fperms 0700 /var/log/neutron
266 fowners neutron:neutron /var/log neutron
267 }
268
269
270
271 1.1 sys-cluster/neutron/neutron-2013.1.3-r6.ebuild
272
273 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3-r6.ebuild?rev=1.1&view=markup
274 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3-r6.ebuild?rev=1.1&content-type=text/plain
275
276 Index: neutron-2013.1.3-r6.ebuild
277 ===================================================================
278 # Copyright 1999-2013 Gentoo Foundation
279 # Distributed under the terms of the GNU General Public License v2
280 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2013.1.3-r6.ebuild,v 1.1 2013/09/27 00:41:28 prometheanfire Exp $
281
282 EAPI=5
283 PYTHON_COMPAT=( python2_7 )
284
285 inherit distutils-r1
286
287 #restricted due to packages missing and bad depends in the test ==webob-1.0.8
288 RESTRICT="test"
289 DESCRIPTION="Quantum is a virtual network service for Openstack."
290 HOMEPAGE="https://launchpad.net/neutron"
291 SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/quantum-${PV}.tar.gz"
292 S="${WORKDIR}/quantum-${PV}"
293
294 LICENSE="Apache-2.0"
295 SLOT="0"
296 KEYWORDS="~amd64 ~x86"
297 IUSE="+dhcp +l3 +metadata +openvswitch +server test sqlite mysql postgres"
298 REQUIRED_USE="|| ( mysql postgres sqlite )"
299
300 #the cliff dep is as below because it depends on pyparsing, which only has 2.7 OR 3.2, not both
301 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
302 app-admin/sudo
303 test? ( dev-python/cliff[${PYTHON_USEDEP}]
304 dev-python/configobj[${PYTHON_USEDEP}]
305 dev-python/coverage[${PYTHON_USEDEP}]
306 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
307 ~dev-python/mox-0.5.3[${PYTHON_USEDEP}]
308 dev-python/nose[${PYTHON_USEDEP}]
309 dev-python/nosehtmloutput[${PYTHON_USEDEP}]
310 dev-python/nosexcover[${PYTHON_USEDEP}]
311 dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
312 ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
313 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
314 ~dev-python/webtest-1.3.3[${PYTHON_USEDEP}]
315 virtual/python-unittest2[${PYTHON_USEDEP}] )"
316 RDEPEND=">=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
317 >=dev-python/alembic-0.4.1[${PYTHON_USEDEP}]
318 dev-python/paste[${PYTHON_USEDEP}]
319 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
320 >=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
321 >=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
322 >=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
323 >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
324 dev-python/httplib2[${PYTHON_USEDEP}]
325 >=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
326 >=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
327 dev-python/netaddr[${PYTHON_USEDEP}]
328 >=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
329 dev-python/python-novaclient[${PYTHON_USEDEP}]
330 >=dev-python/python-neutronclient-2.2.0[${PYTHON_USEDEP}]
331 <=dev-python/python-neutronclient-3.0.0[${PYTHON_USEDEP}]
332 sqlite? ( >=dev-python/sqlalchemy-0.7.8[sqlite,${PYTHON_USEDEP}]
333 <dev-python/sqlalchemy-0.7.10[sqlite,${PYTHON_USEDEP}] )
334 mysql? ( >=dev-python/sqlalchemy-0.7.8[mysql,${PYTHON_USEDEP}]
335 <dev-python/sqlalchemy-0.7.10[mysql,${PYTHON_USEDEP}] )
336 postgres? ( >=dev-python/sqlalchemy-0.7.8[postgres,${PYTHON_USEDEP}]
337 <dev-python/sqlalchemy-0.7.10[postgres,${PYTHON_USEDEP}] )
338 dev-python/pyudev[${PYTHON_USEDEP}]
339 >=dev-python/webob-1.2[${PYTHON_USEDEP}]
340 >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
341 <dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
342 virtual/python-argparse[${PYTHON_USEDEP}]
343 net-misc/bridge-utils
344 net-misc/openvswitch
345 dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
346
347 pkg_setup() {
348 enewgroup neutron
349 enewuser neutron -1 -1 /var/lib/neutron neutron
350 }
351
352 python_install() {
353 distutils-r1_python_install
354 newconfd "${FILESDIR}/neutron-confd" "quantum"
355 newinitd "${FILESDIR}/neutron-initd" "quantum"
356
357 use server && dosym /etc/init.d/quantum /etc/init.d/quantum-server
358 use dhcp && dosym /etc/init.d/quantum /etc/init.d/quantum-dhcp-agent
359 use l3 && dosym /etc/init.d/quantum /etc/init.d/quantum-l3-agent
360 use metadata && dosym /etc/init.d/quantum /etc/init.d/quantum-metadata-agent
361 use openvswitch && dosym /etc/init.d/quantum /etc/init.d/quantum-openvswitch-agent
362
363 diropts -m 750
364 dodir /var/log/neutron /var/log/quantum
365 fowners neutron:neutron /var/log/neutron
366 keepdir /etc/quantum
367 insinto /etc/quantum
368
369 #it's /bin/ip not /sbin/ip
370 sed -i 's/sbin\/ip\,/bin\/ip\,/g' "etc/quantum/rootwrap.d/*"
371
372 doins "etc/api-paste.ini"
373 doins "etc/dhcp_agent.ini"
374 doins "etc/l3_agent.ini"
375 doins "etc/policy.json"
376 doins "etc/quantum.conf"
377 doins "etc/rootwrap.conf"
378 insinto /etc
379 doins -r "etc/quantum/"
380
381 #remove the etc stuff from usr...
382 rm -R "${D}/usr/etc/"
383
384 insinto "/usr/lib64/python2.7/site-packages/quantum/db/migration/alembic_migrations/"
385 doins -r "quantum/db/migration/alembic_migrations/versions"
386
387 #add sudoers definitions for user neutron
388 insinto /etc/sudoers.d/
389 doins "${FILESDIR}/neutron-sudoers"
390 }
391
392 pkg_config() {
393 fperms 0700 /var/log/neutron
394 fowners neutron:neutron /var/log neutron
395 }