Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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-2015.1.1.ebuild neutron-2015.1.9999.ebuild ChangeLog
Date: Wed, 29 Jul 2015 23:45:32
Message-Id: 20150729234525.11081C3@oystercatcher.gentoo.org
1 prometheanfire 15/07/29 23:45:25
2
3 Modified: neutron-2015.1.9999.ebuild ChangeLog
4 Added: neutron-2015.1.1.ebuild
5 Log:
6 bup
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
9
10 Revision Changes Path
11 1.7 sys-cluster/neutron/neutron-2015.1.9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild?rev=1.7&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild?rev=1.7&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild?r1=1.6&r2=1.7
16
17 Index: neutron-2015.1.9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild,v
20 retrieving revision 1.6
21 retrieving revision 1.7
22 diff -u -r1.6 -r1.7
23 --- neutron-2015.1.9999.ebuild 17 May 2015 23:25:00 -0000 1.6
24 +++ neutron-2015.1.9999.ebuild 29 Jul 2015 23:45:24 -0000 1.7
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2015 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild,v 1.6 2015/05/17 23:25:00 prometheanfire Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2015.1.9999.ebuild,v 1.7 2015/07/29 23:45:24 prometheanfire Exp $
30
31 EAPI=5
32 PYTHON_COMPAT=( python2_7 )
33 @@ -33,7 +33,9 @@
34 <dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
35 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
36 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
37 + <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
38 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
39 + <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
40 >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
41 >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
42 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
43 @@ -49,6 +51,7 @@
44 >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
45 <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
46 >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
47 + <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
48 )"
49
50 RDEPEND="
51 @@ -68,7 +71,7 @@
52 <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
53 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
54 >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
55 - <dev-python/python-neutronclient-3.5.0[${PYTHON_USEDEP}]
56 + <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
57 >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
58 !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
59 compute-only? (
60 @@ -90,7 +93,7 @@
61 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
62 )
63 >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
64 - >=dev-python/python-keystoneclient-1.1.0[${PYTHON_USEDEP}]
65 + >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
66 <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
67 >=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
68 >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
69 @@ -130,6 +133,7 @@
70 dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
71
72 PATCHES=(
73 +
74 )
75
76 pkg_setup() {
77
78
79
80 1.68 sys-cluster/neutron/ChangeLog
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.68&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?rev=1.68&content-type=text/plain
84 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/ChangeLog?r1=1.67&r2=1.68
85
86 Index: ChangeLog
87 ===================================================================
88 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v
89 retrieving revision 1.67
90 retrieving revision 1.68
91 diff -u -r1.67 -r1.68
92 --- ChangeLog 29 Jul 2015 17:51:00 -0000 1.67
93 +++ ChangeLog 29 Jul 2015 23:45:24 -0000 1.68
94 @@ -1,6 +1,12 @@
95 # ChangeLog for sys-cluster/neutron
96 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
97 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.67 2015/07/29 17:51:00 zlogene Exp $
98 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/ChangeLog,v 1.68 2015/07/29 23:45:24 prometheanfire Exp $
99 +
100 +*neutron-2015.1.1 (29 Jul 2015)
101 +
102 + 29 Jul 2015; Matthew Thode <prometheanfire@g.o>
103 + +neutron-2015.1.1.ebuild, neutron-2015.1.9999.ebuild:
104 + bup
105
106 29 Jul 2015; Mikle Kolyada <zlogene@g.o> neutron-2015.1.0-r2.ebuild:
107 x86 stable wrt bug #554284
108
109
110
111 1.1 sys-cluster/neutron/neutron-2015.1.1.ebuild
112
113 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2015.1.1.ebuild?rev=1.1&view=markup
114 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/neutron/neutron-2015.1.1.ebuild?rev=1.1&content-type=text/plain
115
116 Index: neutron-2015.1.1.ebuild
117 ===================================================================
118 # Copyright 1999-2015 Gentoo Foundation
119 # Distributed under the terms of the GNU General Public License v2
120 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/neutron/neutron-2015.1.1.ebuild,v 1.1 2015/07/29 23:45:24 prometheanfire Exp $
121
122 EAPI=5
123 PYTHON_COMPAT=( python2_7 )
124
125 inherit distutils-r1 linux-info user
126
127 DESCRIPTION="A virtual network service for Openstack"
128 HOMEPAGE="https://launchpad.net/neutron"
129 SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
130
131 LICENSE="Apache-2.0"
132 SLOT="0"
133 KEYWORDS="~amd64 ~x86"
134 IUSE="compute-only dhcp doc l3 metadata openvswitch linuxbridge server test sqlite mysql postgres"
135 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
136 compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
137 || ( openvswitch linuxbridge ) )"
138
139 DEPEND="
140 dev-python/setuptools[${PYTHON_USEDEP}]
141 >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
142 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
143 app-admin/sudo
144 test? (
145 ${RDEPEND}
146 >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
147 <dev-python/hacking-0.11[${PYTHON_USEDEP}]
148 >=dev-python/cliff-1.10.0[${PYTHON_USEDEP}]
149 <dev-python/cliff-1.11.0[${PYTHON_USEDEP}]
150 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
151 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
152 <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
153 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
154 <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
155 >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
156 >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
157 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
158 !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
159 <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
160 >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
161 <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
162 >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
163 >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
164 !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
165 >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
166 >=dev-python/webtest-2.0[${PYTHON_USEDEP}]
167 >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
168 <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
169 >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
170 <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
171 )"
172
173 RDEPEND="
174 dev-python/paste[${PYTHON_USEDEP}]
175 >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
176 >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
177 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
178 >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
179 !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
180 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
181 >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
182 >=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
183 !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
184 dev-python/jsonrpclib[${PYTHON_USEDEP}]
185 >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
186 >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
187 <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
188 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
189 >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
190 <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
191 >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
192 !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
193 compute-only? (
194 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
195 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
196 )
197 sqlite? (
198 >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
199 <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
200 )
201 mysql? (
202 dev-python/mysql-python
203 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
204 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
205 )
206 postgres? (
207 dev-python/psycopg:2
208 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
209 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
210 )
211 >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
212 >=dev-python/python-keystoneclient-1.2.0[${PYTHON_USEDEP}]
213 <dev-python/python-keystoneclient-1.4.0[${PYTHON_USEDEP}]
214 >=dev-python/alembic-0.7.2[${PYTHON_USEDEP}]
215 >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
216 >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
217 <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
218 >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
219 <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
220 >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
221 <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
222 >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
223 <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
224 >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
225 <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
226 >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
227 <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
228 >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
229 <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
230 >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
231 <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
232 >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
233 <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
234 >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
235 <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
236 >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
237 <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
238 >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
239 <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
240 >=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
241 <dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
242 dev-python/pyudev[${PYTHON_USEDEP}]
243 sys-apps/iproute2
244 net-misc/bridge-utils
245 net-firewall/ipset
246 net-firewall/iptables
247 net-firewall/ebtables
248 openvswitch? ( net-misc/openvswitch )
249 dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
250
251 PATCHES=(
252
253 )
254
255 pkg_setup() {
256 linux-info_pkg_setup
257 CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
258 IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
259 NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
260 if linux_config_exists; then
261 for module in ${CONFIG_CHECK_MODULES}; do
262 linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
263 done
264 fi
265 enewgroup neutron
266 enewuser neutron -1 -1 /var/lib/neutron neutron
267 }
268
269 pkg_config() {
270 fperms 0700 /var/log/neutron
271 fowners neutron:neutron /var/log neutron
272 }
273
274 src_prepare() {
275 #it's /bin/ip not /sbin/ip
276 sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/*
277 distutils-r1_src_prepare
278 }
279
280 python_compile_all() {
281 use doc && make -C doc html
282 }
283
284 python_test() {
285 # https://bugs.launchpad.net/neutron/+bug/1234857
286 # https://bugs.launchpad.net/swift/+bug/1249727
287 # https://bugs.launchpad.net/neutron/+bug/1251657
288 # turn multiprocessing off, testr will use it --parallel
289 local DISTUTILS_NO_PARALLEL_BUILD=1
290 # Move tests out that attempt net connection, have failures
291 mv $(find . -name test_ovs_tunnel.py) . || die
292 sed -e 's:test_app_using_ipv6_and_ssl:_&:' \
293 -e 's:test_start_random_port_with_ipv6:_&:' \
294 -i neutron/tests/unit/test_wsgi.py || die
295 testr init
296 testr run --parallel || die "failed testsuite under python2.7"
297 }
298
299 python_install() {
300 distutils-r1_python_install
301 if use server; then
302 newinitd "${FILESDIR}/neutron.initd" "neutron-server"
303 newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
304 dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
305 fi
306 if use dhcp; then
307 newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
308 newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
309 fi
310 if use l3; then
311 newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
312 newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
313 fi
314 if use metadata; then
315 newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
316 newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
317 fi
318 if use openvswitch; then
319 newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
320 newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
321 newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
322 newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
323 fi
324 if use linuxbridge; then
325 newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
326 newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
327 fi
328 diropts -m 755 -o neutron -g neutron
329 dodir /var/log/neutron /var/lib/neutron
330 keepdir /etc/neutron
331 insinto /etc/neutron
332 insopts -m 0640 -o neutron -g neutron
333
334 doins etc/*
335 # stupid renames
336 rm "${D}etc/neutron/quantum"
337 insinto /etc/neutron
338 doins -r "etc/neutron/plugins"
339 insopts -m 0640 -o root -g root
340 doins "etc/rootwrap.conf"
341 doins -r "etc/neutron/rootwrap.d"
342
343 insopts -m 0644
344 insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
345 doins -r "neutron/db/migration/alembic_migrations/versions"
346
347 #add sudoers definitions for user neutron
348 insinto /etc/sudoers.d/
349 insopts -m 0440 -o root -g root
350 newins "${FILESDIR}/neutron.sudoersd" neutron
351
352 #remove superfluous stuff
353 rm -R "${D}/usr/etc/"
354 }
355
356 python_install_all() {
357 use doc && local HTML_DOCS=( doc/build/html/. )
358 distutils-r1_python_install_all
359 }
360
361 pkg_postinst() {
362 elog
363 elog "neutron-server's conf.d file may need updating to include additional ini files"
364 elog "We currently assume the ml2 plugin will be used but do not make assumptions"
365 elog "on if you will use openvswitch or linuxbridge (or something else)"
366 elog
367 elog "Other conf.d files may need updating too, but should be good for the default use case"
368 elog
369 }
Report Message
Find on MARC Find on Google Groups