Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cinder/
Date: Sat, 08 Feb 2020 19:38:50
Message-Id: 1581190721.4e09b19cc62c9e633394da8060a83feb5f924a85.prometheanfire@gentoo
1 commit: 4e09b19cc62c9e633394da8060a83feb5f924a85
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 8 19:38:16 2020 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 8 19:38:41 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e09b19c
7
8 sys-cluster/cinder: 15.0.0 cleanup
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
12
13 sys-cluster/cinder/Manifest | 2 -
14 sys-cluster/cinder/cinder-15.0.0.ebuild | 214 --------------------------------
15 2 files changed, 216 deletions(-)
16
17 diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
18 index 47d917ba826..4c5415d0762 100644
19 --- a/sys-cluster/cinder/Manifest
20 +++ b/sys-cluster/cinder/Manifest
21 @@ -1,5 +1,3 @@
22 -DIST cinder-15.0.0.tar.gz 5515047 BLAKE2B c7b62dc424bda2a86b9369f283fae4d891f55922228dc2c05206cee67bb7553b75b98e86f8d90035d0566baddad28a76aa4ca454fb4e003eaff346d2bb49a699 SHA512 f80705782976ec778681ef65f5da79ee2028a8dccbe9a14150b3577354882beedbde73f562b40ec395427e23766688299e07bf173476627c579bc812eec065fa
23 DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f
24 -DIST cinder.conf.sample-15.0.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
25 DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
26 DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a
27
28 diff --git a/sys-cluster/cinder/cinder-15.0.0.ebuild b/sys-cluster/cinder/cinder-15.0.0.ebuild
29 deleted file mode 100644
30 index 023a076b4f1..00000000000
31 --- a/sys-cluster/cinder/cinder-15.0.0.ebuild
32 +++ /dev/null
33 @@ -1,214 +0,0 @@
34 -# Copyright 1999-2020 Gentoo Authors
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=7
38 -
39 -PYTHON_COMPAT=( python3_{6,7} )
40 -inherit distutils-r1 eutils linux-info user
41 -
42 -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
43 -HOMEPAGE="https://launchpad.net/cinder"
44 -
45 -if [[ ${PV} == *9999 ]];then
46 - inherit git-r3
47 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}"
48 - EGIT_REPO_URI="https://github.com/openstack/cinder.git"
49 - EGIT_BRANCH="stable/train"
50 -else
51 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}
52 - https://tarballs.openstack.org/${PN}/${P}.tar.gz"
53 - KEYWORDS="amd64 ~arm64 x86"
54 -fi
55 -
56 -LICENSE="Apache-2.0"
57 -SLOT="0"
58 -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
59 -RESTRICT="!test? ( test )"
60 -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
61 -
62 -CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
63 - !~dev-python/pbr-2.1.0"
64 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
65 - ${CDEPEND}
66 - app-admin/sudo"
67 -
68 -RDEPEND="
69 - ${CDEPEND}
70 - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
71 - >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}]
72 - >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}]
73 - !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
74 - !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}]
75 - >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}]
76 - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
77 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
78 - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
79 - virtual/python-ipaddress[${PYTHON_USEDEP}]
80 - >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}]
81 - >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}]
82 - >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}]
83 - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
84 - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
85 - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
86 - >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
87 - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
88 - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
89 - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
90 - >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}]
91 - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
92 - >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}]
93 - >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}]
94 - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
95 - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
96 - >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
97 - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
98 - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
99 - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
100 - >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}]
101 - >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}]
102 - >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
103 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
104 - >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}]
105 - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
106 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
107 - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
108 - <dev-python/prettytable-0.8[${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/suds-0.6[${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.17.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 -# qemu is needed for image conversion
171 -
172 -#PATCHES=(
173 -#)
174 -
175 -pkg_pretend() {
176 - linux-info_pkg_setup
177 - CONFIG_CHECK_MODULES=""
178 - if use tcp; then
179 - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
180 - fi
181 - if use rdma; then
182 - CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
183 - fi
184 - if use infiniband; then
185 - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
186 - fi
187 - if linux_config_exists; then
188 - for module in ${CONFIG_CHECK_MODULES}; do
189 - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
190 - done
191 - fi
192 -}
193 -
194 -pkg_setup() {
195 - enewgroup cinder
196 - enewuser cinder -1 -1 /var/lib/cinder cinder
197 -}
198 -
199 -python_prepare_all() {
200 - sed -i '/^hacking/d' test-requirements.txt || die
201 - # only used for docs
202 - sed -i '/^sphinx-feature-classification/d' requirements.txt || die
203 - distutils-r1_python_prepare_all
204 -}
205 -
206 -python_test() {
207 - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
208 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
209 -}
210 -
211 -python_install_all() {
212 - distutils-r1_python_install_all
213 - keepdir /etc/cinder
214 - dodir /etc/cinder/rootwrap.d
215 -
216 - for svc in api scheduler volume; do
217 - newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
218 - done
219 -
220 - insinto /etc/cinder
221 - insopts -m0640 -o cinder -g cinder
222 - doins "etc/cinder/api-httpd.conf"
223 - doins "etc/cinder/logging_sample.conf"
224 - doins "etc/cinder/rootwrap.conf"
225 - doins "etc/cinder/api-paste.ini"
226 - doins "etc/cinder/resource_filters.json"
227 - newins "${DISTDIR}/cinder.conf.sample-${PV}" "cinder.conf.sample"
228 - insinto /etc/cinder/rootwrap.d
229 - doins "etc/cinder/rootwrap.d/volume.filters"
230 -
231 - dodir /var/log/cinder
232 - fowners cinder:cinder /var/log/cinder
233 -
234 - #add sudoers definitions for user nova
235 - insinto /etc/sudoers.d/
236 - insopts -m 0440 -o root -g root
237 - newins "${FILESDIR}/cinder.sudoersd" cinder
238 - # stupid python
239 - rm -r "${ED}"/usr/etc
240 -}
241 -
242 -pkg_postinst() {
243 - if use iscsi ; then
244 - elog "Cinder needs tgtd to be installed and running to work with iscsi"
245 - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
246 - fi
247 -}