1 |
commit: 865452f87d00ed2958b379e6421ec46981d2ce2b |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 23 18:04:57 2018 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 23 18:05:22 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865452f8 |
7 |
|
8 |
sys-cluster/cinder: 12.0.1 stable with cleanup |
9 |
|
10 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
11 |
|
12 |
sys-cluster/cinder/Manifest | 1 - |
13 |
sys-cluster/cinder/cinder-12.0.0.ebuild | 218 -------------------------------- |
14 |
sys-cluster/cinder/cinder-12.0.1.ebuild | 2 +- |
15 |
3 files changed, 1 insertion(+), 220 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest |
18 |
index caa1e9a070d..023fd379ca5 100644 |
19 |
--- a/sys-cluster/cinder/Manifest |
20 |
+++ b/sys-cluster/cinder/Manifest |
21 |
@@ -1,5 +1,4 @@ |
22 |
DIST cinder-11.1.0.tar.gz 5813863 BLAKE2B 467ebe47d92b8a9c612b6d2c30ca9a3b737b33cf999c3612079cb6d6886ee986e60f9eb15bc6cd3e2adc7ab9c4e956ca41c9324c23f8892cdea9aedd1e1e035c SHA512 193914d69144afba54bda7b3d05a8140501368c2fd44dd203dff5006228dad47602c4da244dc844781cff36581987ee236fc5238c7d78062e7cb78b8795b1f28 |
23 |
-DIST cinder-12.0.0.tar.gz 5359294 BLAKE2B 85a7422ba3a562546cb192cabd6d9614adf8e4daa5cd86d98b6c3a49bd3ecea71027ce9e075f297f998d6539803f02505153fb09586928a159fce7683db6f680 SHA512 dbc65a0231ae584734a9cb9b29429a5ebecb15caf340237e8c3064b7e4c02793e6ec988554588aff46b825a44eac75fb748b25001ac28667752acc8fe199022d |
24 |
DIST cinder-12.0.1.tar.gz 5333749 BLAKE2B 9a78b3a4a6212018e9bfa2ec29ee3c26dbb11a77214eeea2a421fcb898f75a15da78a6e7b6d42793b5ac833003b20bc39a56851a177fca6ec1ca96684d7e3bba SHA512 4b07a3cd579ee235446eb6eaf50698b629a6d24d5e7ada2d99635702aa3d53bab2038edf79f7b741d1039a88a752a1a093c454648c88abae8dc7070c59d16c07 |
25 |
DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654 |
26 |
DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908 |
27 |
|
28 |
diff --git a/sys-cluster/cinder/cinder-12.0.0.ebuild b/sys-cluster/cinder/cinder-12.0.0.ebuild |
29 |
deleted file mode 100644 |
30 |
index 1ced12d0b38..00000000000 |
31 |
--- a/sys-cluster/cinder/cinder-12.0.0.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,218 +0,0 @@ |
34 |
-# Copyright 1999-2018 Gentoo Foundation |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
-PYTHON_COMPAT=( python2_7 python3_{4,5} ) |
39 |
- |
40 |
-inherit distutils-r1 eutils git-r3 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/queens/cinder.conf.sample -> queens-cinder.conf.sample" |
48 |
- EGIT_REPO_URI="https://github.com/openstack/cinder.git" |
49 |
- EGIT_BRANCH="stable/queens" |
50 |
-else |
51 |
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample |
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 |
-KEYWORDS="" |
59 |
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" |
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/Babel-2.3.4[${PYTHON_USEDEP}] |
71 |
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}] |
72 |
- >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] |
73 |
- >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}] |
74 |
- dev-python/enum34[$(python_gen_usedep 'python2_7')] |
75 |
- >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
76 |
- !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}] |
77 |
- <dev-python/eventlet-0.21.0[${PYTHON_USEDEP}] |
78 |
- >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] |
79 |
- >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] |
80 |
- >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
81 |
- >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] |
82 |
- <dev-python/jsonschema-3.0.0[${PYTHON_USEDEP}] |
83 |
- virtual/python-ipaddress[${PYTHON_USEDEP}] |
84 |
- >=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}] |
85 |
- >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}] |
86 |
- >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] |
87 |
- !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
88 |
- >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] |
89 |
- >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}] |
90 |
- >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}] |
91 |
- >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] |
92 |
- >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] |
93 |
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] |
94 |
- >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}] |
95 |
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] |
96 |
- >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}] |
97 |
- >=dev-python/oslo-privsep-1.23.0[${PYTHON_USEDEP}] |
98 |
- >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] |
99 |
- >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] |
100 |
- >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] |
101 |
- !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] |
102 |
- >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] |
103 |
- !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] |
104 |
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}] |
105 |
- >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] |
106 |
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
107 |
- >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] |
108 |
- >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] |
109 |
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
110 |
- >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] |
111 |
- <dev-python/prettytable-0.8[${PYTHON_USEDEP}] |
112 |
- >=dev-python/psutil-3.2.2[${PYTHON_USEDEP}] |
113 |
- >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] |
114 |
- >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] |
115 |
- !~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}] |
116 |
- !~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}] |
117 |
- >=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}] |
118 |
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] |
119 |
- >=dev-python/python-novaclient-9.1.0[${PYTHON_USEDEP}] |
120 |
- >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] |
121 |
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] |
122 |
- >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] |
123 |
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
124 |
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
125 |
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}] |
126 |
- >=dev-python/taskflow-2.16.0[${PYTHON_USEDEP}] |
127 |
- >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}] |
128 |
- !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}] |
129 |
- !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}] |
130 |
- !~dev-python/rtslib-fb-2.1.64[${PYTHON_USEDEP}] |
131 |
- >=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}] |
132 |
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}] |
133 |
- sqlite? ( |
134 |
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
135 |
- !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}] |
136 |
- !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}] |
137 |
- !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}] |
138 |
- !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}] |
139 |
- ) |
140 |
- mysql? ( |
141 |
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
142 |
- !~dev-python/pymysql-0.7.7[${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 |
- postgres? ( |
150 |
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] |
151 |
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
152 |
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}] |
153 |
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}] |
154 |
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}] |
155 |
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}] |
156 |
- ) |
157 |
- >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}] |
158 |
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}] |
159 |
- ~dev-python/suds-0.6[${PYTHON_USEDEP}] |
160 |
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}] |
161 |
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}] |
162 |
- >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] |
163 |
- >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}] |
164 |
- >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] |
165 |
- >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] |
166 |
- >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] |
167 |
- >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] |
168 |
- >=dev-python/cryptography-1.9[${PYTHON_USEDEP}] |
169 |
- !~dev-python/cryptography-2.0[${PYTHON_USEDEP}] |
170 |
- iscsi? ( |
171 |
- tgt? ( sys-block/tgt ) |
172 |
- sys-block/open-iscsi |
173 |
- ) |
174 |
- lvm? ( sys-fs/lvm2 ) |
175 |
- memcached? ( net-misc/memcached ) |
176 |
- app-emulation/qemu |
177 |
- sys-fs/sysfsutils" |
178 |
-# qemu is needed for image conversion |
179 |
- |
180 |
-#PATCHES=( |
181 |
-#) |
182 |
- |
183 |
-pkg_pretend() { |
184 |
- linux-info_pkg_setup |
185 |
- CONFIG_CHECK_MODULES="" |
186 |
- if use tcp; then |
187 |
- CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " |
188 |
- fi |
189 |
- if use rdma; then |
190 |
- CONFIG_CHECK_MODULES+="INFINIBAND_ISER " |
191 |
- fi |
192 |
- if use infiniband; then |
193 |
- CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" |
194 |
- fi |
195 |
- if linux_config_exists; then |
196 |
- for module in ${CONFIG_CHECK_MODULES}; do |
197 |
- linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" |
198 |
- done |
199 |
- fi |
200 |
-} |
201 |
- |
202 |
-pkg_setup() { |
203 |
- enewgroup cinder |
204 |
- enewuser cinder -1 -1 /var/lib/cinder cinder |
205 |
-} |
206 |
- |
207 |
-python_prepare_all() { |
208 |
- sed -i '/^hacking/d' test-requirements.txt || die |
209 |
- distutils-r1_python_prepare_all |
210 |
-} |
211 |
- |
212 |
-python_test() { |
213 |
- # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 |
214 |
- nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" |
215 |
-} |
216 |
- |
217 |
-python_install_all() { |
218 |
- distutils-r1_python_install_all |
219 |
- keepdir /etc/cinder |
220 |
- dodir /etc/cinder/rootwrap.d |
221 |
- |
222 |
- for svc in api scheduler volume; do |
223 |
- newinitd "${FILESDIR}/cinder.initd" cinder-${svc} |
224 |
- done |
225 |
- |
226 |
- insinto /etc/cinder |
227 |
- insopts -m0640 -o cinder -g cinder |
228 |
- doins "etc/cinder/api-httpd.conf" |
229 |
- doins "etc/cinder/logging_sample.conf" |
230 |
- doins "etc/cinder/rootwrap.conf" |
231 |
- doins "etc/cinder/api-paste.ini" |
232 |
- doins "etc/cinder/resource_filters.json" |
233 |
- newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample" |
234 |
- insinto /etc/cinder/rootwrap.d |
235 |
- doins "etc/cinder/rootwrap.d/volume.filters" |
236 |
- |
237 |
- dodir /var/log/cinder |
238 |
- fowners cinder:cinder /var/log/cinder |
239 |
- |
240 |
- #add sudoers definitions for user nova |
241 |
- insinto /etc/sudoers.d/ |
242 |
- insopts -m 0440 -o root -g root |
243 |
- newins "${FILESDIR}/cinder.sudoersd" cinder |
244 |
-} |
245 |
- |
246 |
-pkg_postinst() { |
247 |
- if use iscsi ; then |
248 |
- elog "Cinder needs tgtd to be installed and running to work with iscsi" |
249 |
- elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" |
250 |
- fi |
251 |
-} |
252 |
|
253 |
diff --git a/sys-cluster/cinder/cinder-12.0.1.ebuild b/sys-cluster/cinder/cinder-12.0.1.ebuild |
254 |
index 7c4c55c46c3..1ced12d0b38 100644 |
255 |
--- a/sys-cluster/cinder/cinder-12.0.1.ebuild |
256 |
+++ b/sys-cluster/cinder/cinder-12.0.1.ebuild |
257 |
@@ -17,7 +17,7 @@ if [[ ${PV} == *9999 ]];then |
258 |
else |
259 |
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/queens/cinder.conf.sample -> queens-cinder.conf.sample |
260 |
https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
261 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
262 |
+ KEYWORDS="amd64 ~arm64 x86" |
263 |
fi |
264 |
|
265 |
LICENSE="Apache-2.0" |