Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/nova/
Date: Tue, 25 Sep 2018 22:22:29
Message-Id: 1537914122.e34b3d26b20c7ff9a282282ea4428976bebaee7c.prometheanfire@gentoo
1 commit: e34b3d26b20c7ff9a282282ea4428976bebaee7c
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 24 17:56:06 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 25 22:22:02 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e34b3d26
7
8 sys-cluster/nova: 16.1.5, 17.0.6, 18.0.1 bump
9
10 Package-Manager: Portage-2.3.49, Repoman-2.3.11
11
12 sys-cluster/nova/Manifest | 8 +-
13 .../{nova-18.0.0.ebuild => nova-16.1.5.ebuild} | 124 ++++++++++-----------
14 .../{nova-18.0.0.ebuild => nova-17.0.6.ebuild} | 52 +++++----
15 .../{nova-18.0.0.ebuild => nova-18.0.1.ebuild} | 2 +-
16 4 files changed, 96 insertions(+), 90 deletions(-)
17
18 diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
19 index ae250fb539a..fd0723c3117 100644
20 --- a/sys-cluster/nova/Manifest
21 +++ b/sys-cluster/nova/Manifest
22 @@ -1,9 +1,13 @@
23 DIST nova-16.1.4.tar.gz 10975664 BLAKE2B d6f314bf145d26660b1d14f637dc2a0451a79719d081206d7867281cc828ba5cee1c5c0529109d6592b9bf8cfd1faeb6425d6be9eb8414a48cb6417e1b8d847c SHA512 64ffc73eb61fdfd39a20ec4ab034669442ce17b1e352a5674d1def7d7e65a2b7f5650a0d0621b05c0602c709506b51a88c4494bcdbd8ce10432963e6d1070430
24 +DIST nova-16.1.5.tar.gz 10992593 BLAKE2B c62ac7c4628fd50fb6d2d9410bd85ad1a62cc01a6767fcc218b05a862798ace53f423516392d693283a361e1744c7b798adde89cb692d2f2fe1806a5fd8204aa SHA512 bb653f062f192409296dc3a294fa94e657fc61c530fa8c0c75f80c2c8ab10d69008a46e6b6fafe407ed138d9b727e7fe8f5e54f275a41c3615bc1acadb9a73b9
25 DIST nova-17.0.5.tar.gz 11064252 BLAKE2B 0a72cb0b1ed1ec8a2340572254dca1f56711bb135319ccccbacc04b0c251bc67000b7350d8a2f2477db2fd9d52e79a1254085d3718884849fffdf25227cadc1b SHA512 cb6a4b16afdb565239948dbaf1e868d4d9c7b12d771850b10abb6c04455e5c7652c04980aad0cf1f7892f62eb9eedfa7b58cea49bd9210d22b18fed7b3935851
26 -DIST nova-18.0.0.tar.gz 11433858 BLAKE2B e115514fc1cd2c0d8d726a4706182b15cfe2ab10cd7bd3b0ff0d28816289a26c83413749a3e5e1b1a8eb82b31329f9b6870b143935a6063ef1d13d9dcfea6454 SHA512 9bfdd4c559a3af5bb493d600a2b19f9bf804c5ddae485f463d82ba42c627de3c27df7e487559e1896671afeb893021626f5380af6c067cbed006de16c873206f
27 +DIST nova-17.0.6.tar.gz 11094548 BLAKE2B 3c8d8a1d5b422e8c561dc77261a0c4cc5bd0fb0254f41dc57a351f74392b275ae8aa7d6854075ccb2bf0f9a156a7c0cd9d91caf532231fb9006138ec8e6353c7 SHA512 667abea6cdc44b2ec76e460e353d44f29acb673d0edb4e0bd0934c9498cdfc24b47f74f518a863d8c4f06106aeb8e981f6067c1754df81dcc13f0d6b42f273ee
28 +DIST nova-18.0.1.tar.gz 11447569 BLAKE2B b9ddfb5d7366abaf95afa19d5a09fb65d930f2ab3aff7323ee979ddf3652c30d2d63d1116b92978d5547e0c8d9a87aebb3fa855308ba3785abf3347cc8736c8b SHA512 d2470f874351c0fd332cf0c6e1b54309aad34827c5c20317e8bf0700973327c1c057eb110b3cba16cb4091298517ea82f49e577eee10cde90a9baa03c6cb3b3a
29 DIST nova.conf.sample-16.1.4 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
30 +DIST nova.conf.sample-16.1.5 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
31 DIST nova.conf.sample-17.0.5 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
32 -DIST nova.conf.sample-18.0.0 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
33 +DIST nova.conf.sample-17.0.6 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
34 +DIST nova.conf.sample-18.0.1 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
35 DIST nova.conf.sample-2017.2.9999 360926 BLAKE2B 0cdfcff1d5faf5803de72b8113085591df4d1c7feb0591df786a5bf0e13ff133c1fcc4a2c3ebfdadf2a60943a7810e18813a00f5f78987daf3c271e3ba627911 SHA512 68f548e998396c7b18692fb3b1e9bf267f9bc06d73f602bb8f20bba426b6ede01e270447906f1685133cdbfd43b76ed5a9913b0167ce70f1ff3debd1ca11d378
36 DIST nova.conf.sample-2018.1.9999 361499 BLAKE2B 3d5543fbec2b2688d8cc1a2dbc5d954302c4168999ddd9349f3602035259439e7b1daac05bd7d60d61e9296a37ae62aaedd63cc4d77f2e03cec4614a4b3d470e SHA512 c1d14671ecb2c1941a98b80a267ed47969c1ed5c27d88a2f9fa9857b318c6ff6aae9a0fe22e6c28c964221b3c38df26c632a7bbd24ca4110bd03aafa4db0f459
37 DIST nova.conf.sample-2018.2.9999 387334 BLAKE2B a51b8cdc644ee60390cde3a30ba8f64a339695887b57b2640da39b5a8d34dfec51664b1249955a6cf9202ae19e8e0a8bcd805d4b87d2f6c99a5a6294cc955577 SHA512 be9fbab15ea1cac6d3cd1d186aab904454ef17801f9f4b2f1a37c6e46b4c69fed22a7724846049ebd343beff7753d8db408abae52ad3fca0693d70414c6afc61
38
39 diff --git a/sys-cluster/nova/nova-18.0.0.ebuild b/sys-cluster/nova/nova-16.1.5.ebuild
40 similarity index 67%
41 copy from sys-cluster/nova/nova-18.0.0.ebuild
42 copy to sys-cluster/nova/nova-16.1.5.ebuild
43 index 859632b7ea1..073e8f6c41a 100644
44 --- a/sys-cluster/nova/nova-18.0.0.ebuild
45 +++ b/sys-cluster/nova/nova-16.1.5.ebuild
46 @@ -1,34 +1,26 @@
47 -# Copyright 1999-2018 Gentoo Foundation
48 +# Copyright 1999-2018 Gentoo Authors
49 # Distributed under the terms of the GNU General Public License v2
50
51 EAPI=6
52 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
53 +PYTHON_COMPAT=( python2_7 python3_{4,5} )
54
55 inherit distutils-r1 eutils linux-info multilib user
56
57 DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
58 HOMEPAGE="https://launchpad.net/nova"
59 -
60 -if [[ ${PV} == *9999 ]];then
61 - inherit git-r3
62 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}"
63 - EGIT_REPO_URI="https://github.com/openstack/nova.git"
64 - EGIT_BRANCH="stable/rocky"
65 -else
66 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}
67 +SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/pike/nova.conf.sample -> nova.conf.sample-${PV}
68 https://tarballs.openstack.org/${PN}/${P}.tar.gz"
69 - KEYWORDS="~amd64 ~arm64 ~x86"
70 -fi
71
72 LICENSE="Apache-2.0"
73 SLOT="0"
74 +KEYWORDS="~amd64 ~arm64 ~x86"
75 IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
76 REQUIRED_USE="
77 !compute-only? ( || ( mysql postgres sqlite ) )
78 compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
79
80 CDEPEND="
81 - >=dev-python/setuptools-21.0.0[${PYTHON_USEDEP}]
82 + >=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
83 !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
84 !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
85 !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
86 @@ -83,75 +75,79 @@ RDEPEND="
87 >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
88 >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
89 !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
90 - >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
91 - >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
92 - >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
93 + <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
94 + >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
95 + !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
96 + !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
97 + !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
98 + !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
99 + !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
100 + >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
101 + >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
102 !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
103 >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
104 - >=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
105 - >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
106 - >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
107 - !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
108 + >=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
109 + !~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
110 + >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
111 + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
112 >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
113 - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
114 + dev-python/paste[${PYTHON_USEDEP}]
115 >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
116 <dev-python/prettytable-0.8[${PYTHON_USEDEP}]
117 >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
118 - >=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
119 + >=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
120 + !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
121 >=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
122 - >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
123 + >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
124 >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
125 !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
126 - virtual/python-enum34[${PYTHON_USEDEP}]
127 >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
128 - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
129 + >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}]
130 + !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}]
131 <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
132 - >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
133 - >=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
134 - >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
135 + >=dev-python/python-cinderclient-3.1.0[${PYTHON_USEDEP}]
136 + >=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
137 + >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
138 >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
139 >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
140 - >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
141 + >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
142 >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
143 >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
144 - >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
145 - >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
146 - >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
147 - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
148 - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
149 - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
150 - >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
151 + >=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
152 + >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
153 + >=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
154 + !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
155 + !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
156 + >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
157 + >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
158 + >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
159 + >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
160 !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
161 - >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
162 - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
163 - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
164 - >=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
165 - >=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
166 - >=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
167 - >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
168 - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
169 - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
170 + >=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
171 + >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
172 + >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
173 + >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
174 + !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
175 + >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
176 + >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
177 + !~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
178 + >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
179 + !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
180 + >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
181 >=dev-python/rfc3986-0.3.1[${PYTHON_USEDEP}]
182 - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
183 + >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
184 >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
185 - >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
186 - >=dev-python/os-brick-2.5.0[${PYTHON_USEDEP}]
187 - >=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
188 + >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
189 + >=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
190 + >=dev-python/os-traits-0.3.1[${PYTHON_USEDEP}]
191 >=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
192 - !~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
193 - >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
194 - >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
195 - >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
196 - >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
197 - >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
198 - >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
199 - >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
200 - >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
201 - >=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
202 - >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
203 - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
204 - >=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
205 - >=dev-python/futures-3.0.0[$(python_gen_usedep 'python2_7')]
206 + >=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
207 + >=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
208 + >=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
209 + >=dev-python/os-xenapi-0.2.0[${PYTHON_USEDEP}]
210 + >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
211 + >=dev-python/cursive-0.1.2[${PYTHON_USEDEP}]
212 + >=dev-python/pypowervm-1.1.6[${PYTHON_USEDEP}]
213 dev-python/libvirt-python[${PYTHON_USEDEP}]
214 app-emulation/libvirt[iscsi?]
215 novncproxy? ( www-apps/novnc )
216 @@ -244,6 +240,8 @@ python_install() {
217 # copy migration conf file (not coppied on install via setup.py script)
218 insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
219 doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
220 + # copy the CA cert dir (not coppied on install via setup.py script)
221 + cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
222 }
223
224 pkg_postinst() {
225
226 diff --git a/sys-cluster/nova/nova-18.0.0.ebuild b/sys-cluster/nova/nova-17.0.6.ebuild
227 similarity index 85%
228 copy from sys-cluster/nova/nova-18.0.0.ebuild
229 copy to sys-cluster/nova/nova-17.0.6.ebuild
230 index 859632b7ea1..2b93ede1501 100644
231 --- a/sys-cluster/nova/nova-18.0.0.ebuild
232 +++ b/sys-cluster/nova/nova-17.0.6.ebuild
233 @@ -1,4 +1,4 @@
234 -# Copyright 1999-2018 Gentoo Foundation
235 +# Copyright 1999-2018 Gentoo Authors
236 # Distributed under the terms of the GNU General Public License v2
237
238 EAPI=6
239 @@ -11,11 +11,11 @@ HOMEPAGE="https://launchpad.net/nova"
240
241 if [[ ${PV} == *9999 ]];then
242 inherit git-r3
243 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}"
244 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}"
245 EGIT_REPO_URI="https://github.com/openstack/nova.git"
246 - EGIT_BRANCH="stable/rocky"
247 + EGIT_BRANCH="stable/queens"
248 else
249 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/rocky/nova.conf.sample -> nova.conf.sample-${PV}
250 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/queens/nova.conf.sample -> nova.conf.sample-${PV}
251 https://tarballs.openstack.org/${PN}/${P}.tar.gz"
252 KEYWORDS="~amd64 ~arm64 ~x86"
253 fi
254 @@ -28,7 +28,7 @@ REQUIRED_USE="
255 compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
256
257 CDEPEND="
258 - >=dev-python/setuptools-21.0.0[${PYTHON_USEDEP}]
259 + >=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
260 !~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
261 !~dev-python/setuptools-34.0.0[${PYTHON_USEDEP}]
262 !~dev-python/setuptools-34.0.1[${PYTHON_USEDEP}]
263 @@ -83,15 +83,21 @@ RDEPEND="
264 >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
265 >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
266 !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
267 - >=dev-python/jinja-2.10[${PYTHON_USEDEP}]
268 + <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
269 + >=dev-python/jinja-2.8[${PYTHON_USEDEP}]
270 + !~dev-python/jinja-2.9.0[${PYTHON_USEDEP}]
271 + !~dev-python/jinja-2.9.1[${PYTHON_USEDEP}]
272 + !~dev-python/jinja-2.9.2[${PYTHON_USEDEP}]
273 + !~dev-python/jinja-2.9.3[${PYTHON_USEDEP}]
274 + !~dev-python/jinja-2.9.4[${PYTHON_USEDEP}]
275 >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
276 >=dev-python/lxml-2.4.1[${PYTHON_USEDEP}]
277 !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
278 >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
279 - >=dev-python/cryptography-1.2.1[${PYTHON_USEDEP}]
280 - >=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
281 + >=dev-python/cryptography-1.9.0[${PYTHON_USEDEP}]
282 + !~dev-python/cryptography-2.0.0[${PYTHON_USEDEP}]
283 + >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
284 >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
285 - !~dev-python/greenlet-0.4.14[${PYTHON_USEDEP}]
286 >=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
287 >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
288 >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
289 @@ -107,16 +113,16 @@ RDEPEND="
290 >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
291 <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}]
292 >=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
293 - >=dev-python/keystoneauth-3.9.0[${PYTHON_USEDEP}]
294 - >=dev-python/python-neutronclient-6.7.0[${PYTHON_USEDEP}]
295 + >=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
296 + >=dev-python/python-neutronclient-6.3.0[${PYTHON_USEDEP}]
297 >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
298 >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
299 >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
300 >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
301 >=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
302 >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
303 - >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
304 - >=dev-python/oslo-config-6.1.0[${PYTHON_USEDEP}]
305 + >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
306 + >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
307 >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
308 >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
309 >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
310 @@ -125,8 +131,8 @@ RDEPEND="
311 >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
312 >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
313 >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
314 - >=dev-python/oslo-messaging-6.3.0[${PYTHON_USEDEP}]
315 - >=dev-python/oslo-policy-1.35.0[${PYTHON_USEDEP}]
316 + >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
317 + >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
318 >=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}]
319 >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
320 >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
321 @@ -135,23 +141,19 @@ RDEPEND="
322 >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
323 >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
324 >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
325 - >=dev-python/os-brick-2.5.0[${PYTHON_USEDEP}]
326 + >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}]
327 >=dev-python/os-traits-0.4.0[${PYTHON_USEDEP}]
328 >=dev-python/os-vif-1.7.0[${PYTHON_USEDEP}]
329 !~dev-python/os-vif-1.8.0[${PYTHON_USEDEP}]
330 >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}]
331 >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
332 - >=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
333 - >=dev-python/os-xenapi-0.3.3[${PYTHON_USEDEP}]
334 + >=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
335 + >=dev-python/os-xenapi-0.3.1[${PYTHON_USEDEP}]
336 >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
337 >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
338 - >=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
339 - >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
340 - >=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]
341 + >=dev-python/pypowervm-1.1.10[${PYTHON_USEDEP}]
342 + >=dev-python/os-service-types-1.1.0[${PYTHON_USEDEP}]
343 >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}]
344 - >=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
345 - >=dev-python/zVMCloudConnector-1.1.1[${PYTHON_USEDEP}]
346 - >=dev-python/futures-3.0.0[$(python_gen_usedep 'python2_7')]
347 dev-python/libvirt-python[${PYTHON_USEDEP}]
348 app-emulation/libvirt[iscsi?]
349 novncproxy? ( www-apps/novnc )
350 @@ -244,6 +246,8 @@ python_install() {
351 # copy migration conf file (not coppied on install via setup.py script)
352 insinto "$(python_get_sitedir)/db/sqlalchemy/migrate_repo/"
353 doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
354 + # copy the CA cert dir (not coppied on install via setup.py script)
355 + cp -R "${S}/nova/CA" "${D}/$(python_get_sitedir)/nova/" || die "installing CA files failed"
356 }
357
358 pkg_postinst() {
359
360 diff --git a/sys-cluster/nova/nova-18.0.0.ebuild b/sys-cluster/nova/nova-18.0.1.ebuild
361 similarity index 99%
362 rename from sys-cluster/nova/nova-18.0.0.ebuild
363 rename to sys-cluster/nova/nova-18.0.1.ebuild
364 index 859632b7ea1..7802571382b 100644
365 --- a/sys-cluster/nova/nova-18.0.0.ebuild
366 +++ b/sys-cluster/nova/nova-18.0.1.ebuild
367 @@ -1,4 +1,4 @@
368 -# Copyright 1999-2018 Gentoo Foundation
369 +# Copyright 1999-2018 Gentoo Authors
370 # Distributed under the terms of the GNU General Public License v2
371
372 EAPI=6