1 |
commit: 45cba86466993a043dd4ecece16ff64845f0bd81 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 30 14:12:09 2015 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 30 14:12:09 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45cba864 |
7 |
|
8 |
Revert "sys-cluster/cinder: Drop old" |
9 |
|
10 |
This reverts commit 90ba857a08b1738af9feae9165728fa8387828c1. |
11 |
|
12 |
sys-cluster/cinder/Manifest | 1 + |
13 |
sys-cluster/cinder/cinder-7.0.0.ebuild | 244 +++++++++++++++++++++++++++++++++ |
14 |
2 files changed, 245 insertions(+) |
15 |
|
16 |
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest |
17 |
index c34b7a0..f898fca 100644 |
18 |
--- a/sys-cluster/cinder/Manifest |
19 |
+++ b/sys-cluster/cinder/Manifest |
20 |
@@ -1,3 +1,4 @@ |
21 |
DIST cinder-2015.1.1.tar.gz 2068679 SHA256 11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313 WHIRLPOOL a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9 |
22 |
DIST cinder-2015.1.2.tar.gz 2079511 SHA256 8baa42a3008b0bb0870df678237c0d06ab8ee148b3bf5c00c6b95cfe05c52333 SHA512 312b89068b80c642b8055084575e378ae449b615b6135f15f7aa327808e7a4f05887d0626dc69329c8d08001cf8a8488453b783a81c0f083340e15a8dd411f26 WHIRLPOOL dc3b532603167ac7a910120aca122d54646190c9d1a38a024d03675051b726f09f62d55f8bf5e404d83f8a9df8968bd953c3abf30d6eb45851134d399177fa7e |
23 |
+DIST cinder-7.0.0.tar.gz 2584282 SHA256 8c6b0729ca6a5eaed273b1ca918064e0fd29bcbc537e19ba4dd9cdc73a090933 SHA512 6c34c28450f7eee435df9a59ea4ddbb8209e168b5399e2022223aa76001fd31d00ae0b0012cee5a32f887321a6c3b9f02d206edf99b08fd08d909734e0720f44 WHIRLPOOL 5a116e024d7bc0aad5aef70b59b2d4de8dbbc64f79f0a348d102bed57ecbfcb8f24f79f0e52dbd2bbfd74d6585d01529bea4126e2228cd2cc13507a5cf8d0781 |
24 |
DIST liberty-cinder.conf.sample 122223 SHA256 dad765cbe995576c23b4aa45e316272826fd9a293bf111bcdcb2da9ab562fb43 SHA512 64696a606233fa6a0f2c844924a61e48552f38ce54dadbc8202455d32b9fa37575c8e1d5c1b3e086d37f832e60f754007f2bfa9cd4915e3ae5fd52e283896f64 WHIRLPOOL 2d03754cfe60be0b0f278181e3b9cec399227e643032d9bb53fdafb4504793da6459ceb9b93802d5452ab9b77d9b613ff87f04605833553011a0847d9d3f7e2c |
25 |
|
26 |
diff --git a/sys-cluster/cinder/cinder-7.0.0.ebuild b/sys-cluster/cinder/cinder-7.0.0.ebuild |
27 |
new file mode 100644 |
28 |
index 0000000..8b9c75b |
29 |
--- /dev/null |
30 |
+++ b/sys-cluster/cinder/cinder-7.0.0.ebuild |
31 |
@@ -0,0 +1,244 @@ |
32 |
+# Copyright 1999-2015 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+# $Id$ |
35 |
+ |
36 |
+EAPI=5 |
37 |
+PYTHON_COMPAT=( python2_7 python3_4 ) |
38 |
+ |
39 |
+inherit distutils-r1 eutils linux-info user |
40 |
+ |
41 |
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" |
42 |
+HOMEPAGE="https://launchpad.net/cinder" |
43 |
+SRC_URI="https://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz |
44 |
+ https://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample -> liberty-cinder.conf.sample" |
45 |
+ |
46 |
+LICENSE="Apache-2.0" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~amd64 ~x86" |
49 |
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test" |
50 |
+REQUIRED_USE="|| ( mysql postgres sqlite )" |
51 |
+ |
52 |
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" |
53 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
54 |
+ ${CDEPEND} |
55 |
+ app-admin/sudo |
56 |
+ test? ( |
57 |
+ ${RDEPEND} |
58 |
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}] |
59 |
+ <=dev-python/coverage-4.0[${PYTHON_USEDEP}] |
60 |
+ >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}] |
61 |
+ <=dev-python/ddt-1.0.0[${PYTHON_USEDEP}] |
62 |
+ ~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/mock-1.2[${PYTHON_USEDEP}] |
64 |
+ <=dev-python/mock-1.3.0[${PYTHON_USEDEP}] |
65 |
+ >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}] |
66 |
+ <=dev-python/mox3-0.10.0[${PYTHON_USEDEP}] |
67 |
+ >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}] |
68 |
+ <=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}] |
69 |
+ >=dev-python/psycopg-2.5[${PYTHON_USEDEP}] |
70 |
+ <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}] |
71 |
+ >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] |
72 |
+ <=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}] |
73 |
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] |
74 |
+ !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] |
75 |
+ <dev-python/sphinx-1.3[${PYTHON_USEDEP}] |
76 |
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}] |
77 |
+ <=dev-python/subunit-1.1.0[${PYTHON_USEDEP}] |
78 |
+ >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] |
79 |
+ <=dev-python/testtools-1.8.0[${PYTHON_USEDEP}] |
80 |
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] |
81 |
+ <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}] |
82 |
+ >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] |
83 |
+ <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}] |
84 |
+ >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] |
85 |
+ <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}] |
86 |
+ >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] |
87 |
+ <=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}] |
88 |
+ >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}] |
89 |
+ <=dev-python/os-testr-0.3.0[${PYTHON_USEDEP}] |
90 |
+ >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}] |
91 |
+ <=dev-python/tempest-lib-0.9.0[${PYTHON_USEDEP}] |
92 |
+ >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}] |
93 |
+ <=dev-python/bandit-0.13.2[${PYTHON_USEDEP}] |
94 |
+ )" |
95 |
+ |
96 |
+RDEPEND=" |
97 |
+ ${CDEPEND} |
98 |
+ ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] |
99 |
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}] |
100 |
+ <=dev-python/Babel-2.0[${PYTHON_USEDEP}] |
101 |
+ <=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2_7')] |
102 |
+ >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] |
103 |
+ <=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] |
104 |
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] |
105 |
+ <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}] |
106 |
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] |
107 |
+ <=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}] |
108 |
+ >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}] |
109 |
+ <=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}] |
110 |
+ >=dev-python/kombu-3.0.7[${PYTHON_USEDEP}] |
111 |
+ <=dev-python/kombu-3.0.26[${PYTHON_USEDEP}] |
112 |
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}] |
113 |
+ <=dev-python/lxml-3.4.4[${PYTHON_USEDEP}] |
114 |
+ >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] |
115 |
+ !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] |
116 |
+ <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] |
117 |
+ >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}] |
118 |
+ <=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}] |
119 |
+ >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}] |
120 |
+ <=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}] |
121 |
+ >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}] |
122 |
+ <=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}] |
123 |
+ >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}] |
124 |
+ <=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}] |
125 |
+ >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}] |
126 |
+ <=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}] |
127 |
+ >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}] |
128 |
+ !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}] |
129 |
+ !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}] |
130 |
+ <=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}] |
131 |
+ >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}] |
132 |
+ <=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}] |
133 |
+ >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}] |
134 |
+ <=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}] |
135 |
+ >=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}] |
136 |
+ <=dev-python/oslo-reports-0.5.0[${PYTHON_USEDEP}] |
137 |
+ >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}] |
138 |
+ <=dev-python/oslo-rootwrap-2.3.0[${PYTHON_USEDEP}] |
139 |
+ >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}] |
140 |
+ <=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}] |
141 |
+ >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}] |
142 |
+ <=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}] |
143 |
+ >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}] |
144 |
+ <=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}] |
145 |
+ >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}] |
146 |
+ <=dev-python/oslo-versionedobjects-0.10.0[${PYTHON_USEDEP}] |
147 |
+ ~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}] |
148 |
+ >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}] |
149 |
+ <=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}] |
150 |
+ <=dev-python/paste-2.0.2[${PYTHON_USEDEP}] |
151 |
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
152 |
+ <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}] |
153 |
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] |
154 |
+ <=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] |
155 |
+ >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}] |
156 |
+ <=dev-python/pyparsing-2.0.3[${PYTHON_USEDEP}] |
157 |
+ ~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}] |
158 |
+ >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}] |
159 |
+ <=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}] |
160 |
+ >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}] |
161 |
+ <=dev-python/python-novaclient-2.30.1[${PYTHON_USEDEP}] |
162 |
+ >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}] |
163 |
+ <=dev-python/python-swiftclient-2.6.0[${PYTHON_USEDEP}] |
164 |
+ >=dev-python/requests-2.5.2[${PYTHON_USEDEP}] |
165 |
+ <=dev-python/requests-2.7.0[${PYTHON_USEDEP}] |
166 |
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
167 |
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
168 |
+ <=dev-python/retrying-1.3.3[${PYTHON_USEDEP}] |
169 |
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
170 |
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
171 |
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
172 |
+ <=dev-python/routes-2.2[${PYTHON_USEDEP}] |
173 |
+ >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}] |
174 |
+ <=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}] |
175 |
+ >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}] |
176 |
+ <=dev-python/rtslib-fb-2.1.57[${PYTHON_USEDEP}] |
177 |
+ ~dev-python/six-1.9.0[${PYTHON_USEDEP}] |
178 |
+ sqlite? ( |
179 |
+ >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}] |
180 |
+ <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
181 |
+ ) |
182 |
+ mysql? ( |
183 |
+ dev-python/mysql-python |
184 |
+ >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}] |
185 |
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
186 |
+ ) |
187 |
+ postgres? ( |
188 |
+ dev-python/psycopg:2 |
189 |
+ >=dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}] |
190 |
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
191 |
+ ) |
192 |
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] |
193 |
+ <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}] |
194 |
+ >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}] |
195 |
+ <=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}] |
196 |
+ ~dev-python/suds-0.6[${PYTHON_USEDEP}] |
197 |
+ >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] |
198 |
+ <=dev-python/webob-1.4.1[${PYTHON_USEDEP}] |
199 |
+ >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}] |
200 |
+ <=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}] |
201 |
+ >=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}] |
202 |
+ <=dev-python/oslo-vmware-1.21.0[${PYTHON_USEDEP}] |
203 |
+ >=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}] |
204 |
+ <=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}] |
205 |
+ iscsi? ( |
206 |
+ sys-block/tgt |
207 |
+ sys-block/open-iscsi |
208 |
+ ) |
209 |
+ lvm? ( sys-fs/lvm2 ) |
210 |
+ memcached? ( net-misc/memcached ) |
211 |
+ app-emulation/qemu |
212 |
+ sys-fs/sysfsutils" |
213 |
+# qemu is needed for image conversion |
214 |
+ |
215 |
+PATCHES=( |
216 |
+ |
217 |
+) |
218 |
+ |
219 |
+pkg_setup() { |
220 |
+ linux-info_pkg_setup |
221 |
+ CONFIG_CHECK_MODULES="ISCSI_TCP" |
222 |
+ if linux_config_exists; then |
223 |
+ for module in ${CONFIG_CHECK_MODULES}; do |
224 |
+ linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" |
225 |
+ done |
226 |
+ fi |
227 |
+ enewgroup cinder |
228 |
+ enewuser cinder -1 -1 /var/lib/cinder cinder |
229 |
+} |
230 |
+ |
231 |
+python_prepare_all() { |
232 |
+ sed -i '/^hacking/d' test-requirements.txt || die |
233 |
+ distutils-r1_python_prepare_all |
234 |
+} |
235 |
+ |
236 |
+python_test() { |
237 |
+ # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 |
238 |
+ nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" |
239 |
+} |
240 |
+ |
241 |
+python_install() { |
242 |
+ distutils-r1_python_install |
243 |
+ keepdir /etc/cinder |
244 |
+ dodir /etc/cinder/rootwrap.d |
245 |
+ |
246 |
+ for svc in api scheduler volume; do |
247 |
+ newinitd "${FILESDIR}/cinder.initd" cinder-${svc} |
248 |
+ done |
249 |
+ |
250 |
+ insinto /etc/cinder |
251 |
+ insopts -m0640 -o cinder -g cinder |
252 |
+ newins "${FILESDIR}/etc.liberty/api-httpd.conf" "api-httpd.conf" |
253 |
+ newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini" |
254 |
+ newins "${DISTDIR}/liberty-cinder.conf.sample" "cinder.conf.sample" |
255 |
+ newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf" |
256 |
+ newins "${FILESDIR}/etc.liberty/policy.json" "policy.json" |
257 |
+ newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf" |
258 |
+ insinto /etc/cinder/rootwrap.d |
259 |
+ newins "${FILESDIR}/etc.liberty/rootwrap.d/volume.filters" "volume.filters" |
260 |
+ |
261 |
+ dodir /var/log/cinder |
262 |
+ fowners cinder:cinder /var/log/cinder |
263 |
+ |
264 |
+ #add sudoers definitions for user nova |
265 |
+ insinto /etc/sudoers.d/ |
266 |
+ insopts -m 0440 -o root -g root |
267 |
+ newins "${FILESDIR}/cinder.sudoersd" cinder |
268 |
+} |
269 |
+ |
270 |
+pkg_postinst() { |
271 |
+ if use iscsi ; then |
272 |
+ elog "Cinder needs tgtd to be installed and running to work with iscsi" |
273 |
+ elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" |
274 |
+ fi |
275 |
+} |