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