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/nova: nova-2015.1.9999.ebuild nova-2015.1.1.ebuild ChangeLog
Date: Thu, 30 Jul 2015 00:34:36
Message-Id: 20150730003425.E6609112@oystercatcher.gentoo.org
1 prometheanfire 15/07/30 00:34:25
2
3 Modified: nova-2015.1.9999.ebuild ChangeLog
4 Added: nova-2015.1.1.ebuild
5 Log:
6 bup and adding testing to nova
7
8 (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
9
10 Revision Changes Path
11 1.14 sys-cluster/nova/nova-2015.1.9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild?rev=1.14&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild?rev=1.14&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild?r1=1.13&r2=1.14
16
17 Index: nova-2015.1.9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v
20 retrieving revision 1.13
21 retrieving revision 1.14
22 diff -u -r1.13 -r1.14
23 --- nova-2015.1.9999.ebuild 17 Jun 2015 21:10:37 -0000 1.13
24 +++ nova-2015.1.9999.ebuild 30 Jul 2015 00:34:25 -0000 1.14
25 @@ -1,11 +1,11 @@
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/nova/nova-2015.1.9999.ebuild,v 1.13 2015/06/17 21:10:37 prometheanfire Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.14 2015/07/30 00:34:25 prometheanfire Exp $
30
31 EAPI=5
32 PYTHON_COMPAT=( python2_7 )
33
34 -inherit distutils-r1 eutils git-2 linux-info multilib udev user
35 +inherit distutils-r1 eutils git-2 linux-info multilib user
36
37 DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
38 HOMEPAGE="https://launchpad.net/nova"
39 @@ -15,15 +15,50 @@
40 LICENSE="Apache-2.0"
41 SLOT="0"
42 KEYWORDS=""
43 -IUSE="+compute compute-only +kvm +memcached +novncproxy openvswitch +rabbitmq sqlite mysql postgres xen iscsi"
44 +IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
45 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
46 compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
47 compute? ( ^^ ( kvm xen ) )"
48
49 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
50 - >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
51 - <dev-python/pbr-1.0[${PYTHON_USEDEP}]
52 - app-admin/sudo"
53 +DEPEND="
54 + dev-python/setuptools[${PYTHON_USEDEP}]
55 + >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
56 + <dev-python/pbr-1.0[${PYTHON_USEDEP}]
57 + app-admin/sudo
58 + test? (
59 + ${RDEPEND}
60 + >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
61 + <dev-python/hacking-0.11[${PYTHON_USEDEP}]
62 + >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
63 + >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
64 + <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
65 + >=dev-python/mock-1.0[${PYTHON_USEDEP}]
66 + <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
67 + >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
68 + dev-python/mysql-python[${PYTHON_USEDEP}]
69 + dev-python/psycopg[${PYTHON_USEDEP}]
70 + >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
71 + <dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
72 + >=dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
73 + <dev-python/python-ironicclient-0.6.0[${PYTHON_USEDEP}]
74 + >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
75 + >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
76 + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
77 + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
78 + <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
79 + >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
80 + <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
81 + >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
82 + <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
83 + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
84 + >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
85 + !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
86 + >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
87 + <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
88 + >=dev-python/suds-0.4[${PYTHON_USEDEP}]
89 + >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
90 + <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
91 + )"
92
93 # barbicanclient is in here for doc generation
94 RDEPEND="
95 @@ -152,6 +187,13 @@
96 ./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
97 }
98
99 +python_test() {
100 + # turn multiprocessing off, testr will use it --parallel
101 + local DISTUTILS_NO_PARALLEL_BUILD=1
102 + testr init
103 + testr run --parallel || die "failed testsuite under python2.7"
104 +}
105 +
106 python_install() {
107 distutils-r1_python_install
108
109
110
111
112 1.103 sys-cluster/nova/ChangeLog
113
114 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?rev=1.103&view=markup
115 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?rev=1.103&content-type=text/plain
116 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/ChangeLog?r1=1.102&r2=1.103
117
118 Index: ChangeLog
119 ===================================================================
120 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v
121 retrieving revision 1.102
122 retrieving revision 1.103
123 diff -u -r1.102 -r1.103
124 --- ChangeLog 29 Jul 2015 17:56:28 -0000 1.102
125 +++ ChangeLog 30 Jul 2015 00:34:25 -0000 1.103
126 @@ -1,6 +1,12 @@
127 # ChangeLog for sys-cluster/nova
128 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
129 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.102 2015/07/29 17:56:28 zlogene Exp $
130 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.103 2015/07/30 00:34:25 prometheanfire Exp $
131 +
132 +*nova-2015.1.1 (30 Jul 2015)
133 +
134 + 30 Jul 2015; Matthew Thode <prometheanfire@g.o> +nova-2015.1.1.ebuild,
135 + nova-2015.1.9999.ebuild:
136 + bup and adding testing to nova
137
138 29 Jul 2015; Mikle Kolyada <zlogene@g.o> nova-2015.1.0-r3.ebuild:
139 x86 stable wrt bug #554284
140
141
142
143 1.1 sys-cluster/nova/nova-2015.1.1.ebuild
144
145 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.1.ebuild?rev=1.1&view=markup
146 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/nova/nova-2015.1.1.ebuild?rev=1.1&content-type=text/plain
147
148 Index: nova-2015.1.1.ebuild
149 ===================================================================
150 # Copyright 1999-2015 Gentoo Foundation
151 # Distributed under the terms of the GNU General Public License v2
152 # $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.1.ebuild,v 1.1 2015/07/30 00:34:25 prometheanfire Exp $
153
154 EAPI=5
155 PYTHON_COMPAT=( python2_7 )
156
157 inherit distutils-r1 eutils linux-info multilib user
158
159 DESCRIPTION="A cloud computing fabric controller (main part of an IaaS system) written in Python"
160 HOMEPAGE="https://launchpad.net/nova"
161 SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
162
163 LICENSE="Apache-2.0"
164 SLOT="0"
165 KEYWORDS="~amd64 ~x86"
166 IUSE="+compute compute-only iscsi +kvm +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite test xen"
167 REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
168 compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
169 compute? ( ^^ ( kvm xen ) )"
170
171 DEPEND="
172 dev-python/setuptools[${PYTHON_USEDEP}]
173 >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
174 <dev-python/pbr-1.0[${PYTHON_USEDEP}]
175 app-admin/sudo
176 test? (
177 ${RDEPEND}
178 >=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
179 <dev-python/hacking-0.11[${PYTHON_USEDEP}]
180 >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
181 >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
182 <dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
183 >=dev-python/mock-1.0[${PYTHON_USEDEP}]
184 <dev-python/mock-1.1.0[${PYTHON_USEDEP}]
185 >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
186 dev-python/mysql-python[${PYTHON_USEDEP}]
187 dev-python/psycopg[${PYTHON_USEDEP}]
188 >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
189 <dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
190 >=dev-python/python-ironicclient-0.4.1[${PYTHON_USEDEP}]
191 <dev-python/python-ironicclient-0.6.0[${PYTHON_USEDEP}]
192 >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
193 >=dev-python/requests-mock-0.6.0[${PYTHON_USEDEP}]
194 >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
195 !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
196 <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
197 >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
198 <dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
199 >=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
200 <dev-python/oslotest-1.6.0[${PYTHON_USEDEP}]
201 >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
202 >=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
203 !~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
204 >=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
205 <dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
206 >=dev-python/suds-0.4[${PYTHON_USEDEP}]
207 >=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
208 <dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
209 )"
210
211 # barbicanclient is in here for doc generation
212 RDEPEND="
213 compute-only? (
214 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
215 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
216 )
217 sqlite? (
218 >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
219 <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
220 )
221 mysql? (
222 dev-python/mysql-python
223 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
224 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
225 )
226 postgres? (
227 dev-python/psycopg:2
228 >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
229 <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
230 )
231 >=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
232 >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
233 >=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
234 !~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
235 >=dev-python/jinja-2.6[${PYTHON_USEDEP}]
236 >=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
237 <dev-python/keystonemiddleware-1.6.0[${PYTHON_USEDEP}]
238 >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
239 >=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
240 !~dev-python/routes-2.0[${PYTHON_USEDEP}]
241 >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
242 >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
243 >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
244 dev-python/paste[${PYTHON_USEDEP}]
245 ~dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
246 >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
247 >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
248 dev-python/pyasn1[${PYTHON_USEDEP}]
249 >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
250 >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
251 >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
252 <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
253 >=dev-python/python-cinderclient-1.1.0[${PYTHON_USEDEP}]
254 <dev-python/python-cinderclient-1.2.0[${PYTHON_USEDEP}]
255 >=dev-python/python-neutronclient-2.3.11[${PYTHON_USEDEP}]
256 <dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
257 >=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
258 <dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
259 >=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
260 <dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
261 >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
262 >=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
263 <dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
264 >=dev-python/websockify-0.6.0[${PYTHON_USEDEP}]
265 <dev-python/websockify-0.7.0[${PYTHON_USEDEP}]
266 >=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
267 <dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
268 >=dev-python/oslo-config-1.9.3[${PYTHON_USEDEP}]
269 <dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
270 >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
271 <dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
272 >=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
273 <dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
274 >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
275 <dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
276 >=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
277 <dev-python/oslo-utils-1.5.0[${PYTHON_USEDEP}]
278 >=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
279 <dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
280 >=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
281 <dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
282 >=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
283 <dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
284 >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
285 <dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
286 >=dev-python/rfc3986-0.2.0[${PYTHON_USEDEP}]
287 >=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
288 <dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
289 >=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
290 <dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
291 dev-python/libvirt-python[${PYTHON_USEDEP}]
292 novncproxy? ( www-apps/novnc )
293 sys-apps/iproute2
294 openvswitch? ( net-misc/openvswitch )
295 rabbitmq? ( net-misc/rabbitmq-server )
296 memcached? ( net-misc/memcached )
297 sys-fs/sysfsutils
298 sys-fs/multipath-tools
299 net-misc/bridge-utils
300 compute? (
301 app-cdr/cdrkit
302 kvm? ( app-emulation/qemu )
303 xen? ( app-emulation/xen
304 app-emulation/xen-tools )
305 )
306 iscsi? (
307 sys-fs/lsscsi
308 )"
309
310 PATCHES=(
311 )
312
313 pkg_setup() {
314 linux-info_pkg_setup
315 CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
316 IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
317 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
318 ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
319 if linux_config_exists; then
320 for module in ${CONFIG_CHECK_MODULES}; do
321 linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
322 done
323 fi
324 enewgroup nova
325 enewuser nova -1 -1 /var/lib/nova nova
326 }
327
328 python_prepare() {
329 distutils-r1_python_prepare
330 sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
331 }
332
333 python_compile() {
334 distutils-r1_python_compile
335 ./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
336 }
337
338 python_test() {
339 # turn multiprocessing off, testr will use it --parallel
340 local DISTUTILS_NO_PARALLEL_BUILD=1
341 testr init
342 testr run --parallel || die "failed testsuite under python2.7"
343 }
344
345 python_install() {
346 distutils-r1_python_install
347
348 if use !compute-only; then
349 for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
350 newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
351 done
352 fi
353 use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
354 use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
355
356 diropts -m 0750 -o nova -g qemu
357 dodir /var/log/nova /var/lib/nova/instances
358 diropts -m 0750 -o nova -g nova
359
360 insinto /etc/nova
361 insopts -m 0640 -o nova -g nova
362 newins "etc/nova/nova.conf.sample" "nova.conf"
363 doins "etc/nova/api-paste.ini"
364 doins "etc/nova/logging_sample.conf"
365 doins "etc/nova/policy.json"
366 doins "etc/nova/rootwrap.conf"
367 #rootwrap filters
368 insinto /etc/nova/rootwrap.d
369 doins "etc/nova/rootwrap.d/api-metadata.filters"
370 doins "etc/nova/rootwrap.d/compute.filters"
371 doins "etc/nova/rootwrap.d/network.filters"
372 #copy migration conf file (not coppied on install via setup.py script)
373 insopts -m 0644
374 insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
375 doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
376 #copy the CA cert dir (not coppied on install via setup.py script)
377 cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
378
379 #add sudoers definitions for user nova
380 insinto /etc/sudoers.d/
381 insopts -m 0600 -o root -g root
382 doins "${FILESDIR}/nova-sudoers"
383
384 if use iscsi ; then
385 # Install udev rules for handle iscsi disk with right links under /dev
386 udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
387
388 insinto /etc/nova/
389 doins "${FILESDIR}/scsi-openscsi-link.sh"
390 fi
391 }