1 |
commit: 3cf4c20a1f80d4327b0ea29fd47694d24aaf1f02 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 27 21:54:39 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 27 21:55:01 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cf4c20a |
7 |
|
8 |
sys-cluster/cinder: 16.2.0 stable amd64/x86 with cleanup |
9 |
|
10 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
sys-cluster/cinder/Manifest | 2 - |
14 |
sys-cluster/cinder/cinder-16.1.0.ebuild | 208 -------------------------------- |
15 |
sys-cluster/cinder/cinder-16.2.0.ebuild | 2 +- |
16 |
3 files changed, 1 insertion(+), 211 deletions(-) |
17 |
|
18 |
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest |
19 |
index b8d0f6d88d1..fb24d90ec0a 100644 |
20 |
--- a/sys-cluster/cinder/Manifest |
21 |
+++ b/sys-cluster/cinder/Manifest |
22 |
@@ -1,7 +1,5 @@ |
23 |
-DIST cinder-16.1.0.tar.gz 5445353 BLAKE2B f7e121845b5db3de191c8782577f680cbb93fd26087113bd0c322eed4b27cf071977763a3eacb933d7b8894b56aaf042a115c2dfd20be47f89c9d45f0556c34a SHA512 97fb157eac466d869a707cd05d287a309512952e8f8267b58123b9108eb1c2df66c8d0b799a3fb83087645a09e679b7c6eb24baa4a21b751a1ce35dbb5bd3f4a |
24 |
DIST cinder-16.2.0.tar.gz 5484918 BLAKE2B f2259dd21c060280e856c053bece8fd635f289d8100710b177105227a5ce3a4c4e380b49261671294cf85975c9f665646cefe5f9d66d873e1938a7d141156f4e SHA512 586057d49f9c94daaf163dacf979e62d18be7489b43eeedfa7caa4d23a4a6060f455eea7162020319187466f308d0480a3efb047d0b34ce013f1b5c632e30755 |
25 |
DIST cinder-17.0.0.tar.gz 5759659 BLAKE2B f8a2e6647e38185b962311087f06364108db4a80def2eef909e837d37adfe539f0794cc9d9b95aee88da9aeeb5a6a0fe019fc37bafb8e4ceed8dbdfaa2a7c27b SHA512 cd7b74e5da1e696bd72e8e37f2bbff7c7fe4012aa5eaae4ccc51ddfc743ac68cc9fae885063c75d199a48978e4f479cc55813f489787a84914d98521a42d7fd4 |
26 |
-DIST cinder.conf.sample-16.1.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626 |
27 |
DIST cinder.conf.sample-16.2.0 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626 |
28 |
DIST cinder.conf.sample-17.0.0 186451 BLAKE2B efc75cf3c5e852d411d9c2ed2080eb554a5f81c9b39a2ee9cf44add21842c05ea5b03cc66747da2182d2efc73d83b55323cecd4aa34db99369bf62b5ed1795bc SHA512 ee60a62ec8490a38c995f9c4a9ede8eeec631745bdbc9bc6e1d195370687de5d99aa8754ea017f23e6a9542b987842c7ffd7cf203bfed37f2a7ddbe61a82d517 |
29 |
DIST cinder.conf.sample-2020.1.9999 183294 BLAKE2B 5d0f28b9ad200d912c42c34ca030a5ec3660c57db332677e1b66b314a2865187862c83baf78d122fc0af7f73fbf4f0c7f04b9253882d228dcb863bfc88e37e72 SHA512 faf712a3da37af05e642b3c14f98ce8d4e3db5b736b208d7ca8a18be02ac5626c94b4ed314bd0030d5fa3771b325ba0f24ec3a45188d27fd9de79c97b56e2626 |
30 |
|
31 |
diff --git a/sys-cluster/cinder/cinder-16.1.0.ebuild b/sys-cluster/cinder/cinder-16.1.0.ebuild |
32 |
deleted file mode 100644 |
33 |
index 7a062a48e6f..00000000000 |
34 |
--- a/sys-cluster/cinder/cinder-16.1.0.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,208 +0,0 @@ |
37 |
-# Copyright 1999-2020 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-PYTHON_COMPAT=( python3_7 ) |
43 |
-inherit distutils-r1 eutils linux-info |
44 |
- |
45 |
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" |
46 |
-HOMEPAGE="https://launchpad.net/cinder" |
47 |
- |
48 |
-if [[ ${PV} == *9999 ]];then |
49 |
- inherit git-r3 |
50 |
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV}" |
51 |
- EGIT_REPO_URI="https://github.com/openstack/cinder.git" |
52 |
- EGIT_BRANCH="stable/ussuri" |
53 |
-else |
54 |
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV} |
55 |
- https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
56 |
- KEYWORDS="amd64 ~arm64 x86" |
57 |
-fi |
58 |
- |
59 |
-LICENSE="Apache-2.0" |
60 |
-SLOT="0" |
61 |
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" |
62 |
-RESTRICT="!test? ( test )" |
63 |
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" |
64 |
- |
65 |
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}] |
66 |
- !~dev-python/pbr-2.1.0" |
67 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
68 |
- ${CDEPEND} |
69 |
- app-admin/sudo" |
70 |
- |
71 |
-# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated |
72 |
-RDEPEND=" |
73 |
- ${CDEPEND} |
74 |
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] |
75 |
- >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}] |
76 |
- >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}] |
77 |
- !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] |
78 |
- !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] |
79 |
- >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] |
80 |
- >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] |
81 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
82 |
- >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] |
83 |
- >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}] |
84 |
- >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] |
85 |
- >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] |
86 |
- !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
87 |
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] |
88 |
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] |
89 |
- >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] |
90 |
- >=dev-python/oslo-db-4.35.0[${PYTHON_USEDEP}] |
91 |
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] |
92 |
- >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}] |
93 |
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] |
94 |
- >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}] |
95 |
- >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}] |
96 |
- >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] |
97 |
- >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] |
98 |
- >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] |
99 |
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] |
100 |
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] |
101 |
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] |
102 |
- >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}] |
103 |
- >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}] |
104 |
- >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] |
105 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
106 |
- >=dev-python/paramiko-2.4.0[${PYTHON_USEDEP}] |
107 |
- >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] |
108 |
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
109 |
- >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] |
110 |
- >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] |
111 |
- >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}] |
112 |
- >=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}] |
113 |
- >=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}] |
114 |
- >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}] |
115 |
- >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] |
116 |
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] |
117 |
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] |
118 |
- !~dev-python/requests-2.20.0[${PYTHON_USEDEP}] |
119 |
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
120 |
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
121 |
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] |
122 |
- >=dev-python/taskflow-3.2.0[${PYTHON_USEDEP}] |
123 |
- >=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}] |
124 |
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}] |
125 |
- sqlite? ( |
126 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
127 |
- !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}] |
128 |
- !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}] |
129 |
- !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}] |
130 |
- !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}] |
131 |
- ) |
132 |
- mysql? ( |
133 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
134 |
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
135 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
136 |
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] |
137 |
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] |
138 |
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] |
139 |
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
140 |
- ) |
141 |
- postgres? ( |
142 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
143 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
144 |
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] |
145 |
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] |
146 |
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] |
147 |
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
148 |
- ) |
149 |
- >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] |
150 |
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] |
151 |
- >=dev-python/tabulate-0.8.5[${PYTHON_USEDEP}] |
152 |
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] |
153 |
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] |
154 |
- >=dev-python/oslo-vmware-2.35.0[${PYTHON_USEDEP}] |
155 |
- >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}] |
156 |
- >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] |
157 |
- >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] |
158 |
- >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] |
159 |
- >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] |
160 |
- >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] |
161 |
- >=dev-python/cursive-0.2.1[${PYTHON_USEDEP}] |
162 |
- iscsi? ( |
163 |
- tgt? ( sys-block/tgt ) |
164 |
- sys-block/open-iscsi |
165 |
- ) |
166 |
- lvm? ( sys-fs/lvm2 ) |
167 |
- memcached? ( net-misc/memcached ) |
168 |
- app-emulation/qemu |
169 |
- sys-fs/sysfsutils |
170 |
- acct-user/cinder |
171 |
- acct-group/cinder" |
172 |
-# qemu is needed for image conversion |
173 |
- |
174 |
-#PATCHES=( |
175 |
-#) |
176 |
- |
177 |
-pkg_pretend() { |
178 |
- linux-info_pkg_setup |
179 |
- CONFIG_CHECK_MODULES="" |
180 |
- if use tcp; then |
181 |
- CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " |
182 |
- fi |
183 |
- if use rdma; then |
184 |
- CONFIG_CHECK_MODULES+="INFINIBAND_ISER " |
185 |
- fi |
186 |
- if use infiniband; then |
187 |
- CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" |
188 |
- fi |
189 |
- if linux_config_exists; then |
190 |
- for module in ${CONFIG_CHECK_MODULES}; do |
191 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" |
192 |
- done |
193 |
- fi |
194 |
-} |
195 |
- |
196 |
-python_prepare_all() { |
197 |
- sed -i '/^hacking/d' test-requirements.txt || die |
198 |
- # only used for docs |
199 |
- sed -i '/^sphinx-feature-classification/d' requirements.txt || die |
200 |
- distutils-r1_python_prepare_all |
201 |
-} |
202 |
- |
203 |
-python_test() { |
204 |
- # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 |
205 |
- nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" |
206 |
-} |
207 |
- |
208 |
-python_install_all() { |
209 |
- distutils-r1_python_install_all |
210 |
- keepdir /etc/cinder |
211 |
- dodir /etc/cinder/rootwrap.d |
212 |
- |
213 |
- for svc in api scheduler volume; do |
214 |
- newinitd "${FILESDIR}/cinder.initd" cinder-${svc} |
215 |
- done |
216 |
- |
217 |
- insinto /etc/cinder |
218 |
- insopts -m0640 -o cinder -g cinder |
219 |
- doins "etc/cinder/api-httpd.conf" |
220 |
- doins "etc/cinder/logging_sample.conf" |
221 |
- doins "etc/cinder/rootwrap.conf" |
222 |
- doins "etc/cinder/api-paste.ini" |
223 |
- doins "etc/cinder/resource_filters.json" |
224 |
- newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample" |
225 |
- insinto /etc/cinder/rootwrap.d |
226 |
- doins "etc/cinder/rootwrap.d/volume.filters" |
227 |
- |
228 |
- dodir /var/log/cinder |
229 |
- fowners cinder:cinder /var/log/cinder |
230 |
- |
231 |
- #add sudoers definitions for user nova |
232 |
- insinto /etc/sudoers.d/ |
233 |
- insopts -m 0440 -o root -g root |
234 |
- newins "${FILESDIR}/cinder.sudoersd" cinder |
235 |
- # stupid python |
236 |
- rm -r "${ED}"/usr/etc |
237 |
-} |
238 |
- |
239 |
-pkg_postinst() { |
240 |
- if use iscsi ; then |
241 |
- elog "Cinder needs tgtd to be installed and running to work with iscsi" |
242 |
- elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" |
243 |
- fi |
244 |
-} |
245 |
|
246 |
diff --git a/sys-cluster/cinder/cinder-16.2.0.ebuild b/sys-cluster/cinder/cinder-16.2.0.ebuild |
247 |
index 3065830afe0..a1258620e5c 100644 |
248 |
--- a/sys-cluster/cinder/cinder-16.2.0.ebuild |
249 |
+++ b/sys-cluster/cinder/cinder-16.2.0.ebuild |
250 |
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]];then |
251 |
else |
252 |
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ussuri/cinder.conf.sample -> cinder.conf.sample-${PV} |
253 |
https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
254 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
255 |
+ KEYWORDS="amd64 ~arm64 x86" |
256 |
fi |
257 |
|
258 |
LICENSE="Apache-2.0" |