1 |
commit: c5d14ee40936cb5e024359a8b1da6e94b51016de |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jul 25 18:58:25 2017 +0000 |
4 |
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jul 25 19:00:28 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d14ee4 |
7 |
|
8 |
sys-cluster/cinder: 10.0.4 bup |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.3 |
11 |
|
12 |
sys-cluster/cinder/Manifest | 1 + |
13 |
sys-cluster/cinder/cinder-10.0.4.ebuild | 193 ++++++++++++++++++++++++++++++++ |
14 |
sys-cluster/cinder/metadata.xml | 8 +- |
15 |
3 files changed, 198 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest |
18 |
index f1605372814..5cc880de282 100644 |
19 |
--- a/sys-cluster/cinder/Manifest |
20 |
+++ b/sys-cluster/cinder/Manifest |
21 |
@@ -1,4 +1,5 @@ |
22 |
DIST cinder-10.0.3.tar.gz 4620868 SHA256 53e7538299e3c72c809112e85a065581b38e752ec19a0dbc0c918554eedd6789 SHA512 e22fca956c751a70e2248cab42cca4a0671d8a52537083dc97db4ba2279678f08e894cffba3e6f7c8b32f5313bdccd2af890948c463683ac64e4cf0a3313cc3b WHIRLPOOL b904908c13ade48db737f2491c5afd864ac77fce5f249b8a66b60cde51573b3b43475d0292d6e99509f95f681a347225572944a5eb5451498e2e31fc01fa24f5 |
23 |
+DIST cinder-10.0.4.tar.gz 4625299 SHA256 3e318f87b5d4ac24709c313cea6beb33a1994e6cbf256192dad39f4aa3310219 SHA512 ee66e70f6e002f0186aa7fd5980926f14bee50a7949267e2130285e242c39808b059f6789e2d1ba91930bbe76ddd0c9e16d041212f277e283383b3ce83b31d4f WHIRLPOOL 015b7a3a7af746eb6182332fbe4e757d3c0d8f2c62a5ec62a29cda10cb32ace941266598d759d033362fc3c98d00b1780d4ebc6bb984190cc8ed73ca47e2308b |
24 |
DIST cinder-9.1.4.tar.gz 4195597 SHA256 ee8a2ca264a41c8f4ed48094722d683cffae99cee910f19a140b0d1d0f5251a4 SHA512 8039d5208296ea54fc869fb05dd91451ac3575eb3dd2ed97d0c63120d18b67b02b835a849cd1ec3dae349920895e13665c15a6daa53f67138823053c49ab87a9 WHIRLPOOL f2fd2bbba72d2f74f1395f2b280ed3304ecec37c9bcdc7b73a104d19698dad123ffdbce58249c426245c68584eb7a10a640f38a9192933d8db30a7f45b79c48e |
25 |
DIST newton-cinder-policy.json 6412 SHA256 3a140134201452c52a97eae9f4c45ea30a3a21cc7a30ee619ed37ab0723b6479 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56 WHIRLPOOL f34dc729425fd82ddd9905c675fca9b765b4535dc87ec9d94acd1781c331e466f8688aace4954532e376e704cf3f1c8f4103f22e6838d4403c10311358e1ed2b |
26 |
DIST newton-cinder-volume.filters 11025 SHA256 c36bdb9abb4d97350db9971dae1c44a713911920362a0c6c5bc3cfe2701dd4f6 SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d WHIRLPOOL 7496fffec8e42eb1c3bea39563cef8d48cb607b7de1ba8a4ac9a831b6def3dcbcfdf7d485aa81f52aa9bdf7600a51ba07ff85fbf88c5c70091ad88f8c01ca37e |
27 |
|
28 |
diff --git a/sys-cluster/cinder/cinder-10.0.4.ebuild b/sys-cluster/cinder/cinder-10.0.4.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..9fd3fca29fb |
31 |
--- /dev/null |
32 |
+++ b/sys-cluster/cinder/cinder-10.0.4.ebuild |
33 |
@@ -0,0 +1,193 @@ |
34 |
+# Copyright 1999-2017 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 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 |
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample |
45 |
+https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json |
46 |
+https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters |
47 |
+https://tarballs.openstack.org/${PN}/${P}.tar.gz" |
48 |
+ |
49 |
+LICENSE="Apache-2.0" |
50 |
+SLOT="0" |
51 |
+KEYWORDS="~amd64 ~arm64 ~x86" |
52 |
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" |
53 |
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )" |
54 |
+ |
55 |
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]" |
56 |
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
57 |
+ ${CDEPEND} |
58 |
+ app-admin/sudo" |
59 |
+ |
60 |
+RDEPEND=" |
61 |
+ ${CDEPEND} |
62 |
+ >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}] |
63 |
+ >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] |
64 |
+ dev-python/enum34[$(python_gen_usedep 'python2_7')] |
65 |
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}] |
66 |
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] |
67 |
+ >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] |
68 |
+ >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] |
69 |
+ virtual/python-ipaddress[${PYTHON_USEDEP}] |
70 |
+ >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}] |
71 |
+ >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}] |
72 |
+ >=dev-python/lxml-2.3[${PYTHON_USEDEP}] |
73 |
+ !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] |
74 |
+ >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] |
75 |
+ >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}] |
76 |
+ !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}] |
77 |
+ >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}] |
78 |
+ >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}] |
79 |
+ >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}] |
80 |
+ >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}] |
81 |
+ >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}] |
82 |
+ >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}] |
83 |
+ >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}] |
84 |
+ >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}] |
85 |
+ >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}] |
86 |
+ >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}] |
87 |
+ >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}] |
88 |
+ >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}] |
89 |
+ >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}] |
90 |
+ >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}] |
91 |
+ >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] |
92 |
+ >=dev-python/paramiko-2.0[${PYTHON_USEDEP}] |
93 |
+ dev-python/paste[${PYTHON_USEDEP}] |
94 |
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] |
95 |
+ >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}] |
96 |
+ >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] |
97 |
+ >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] |
98 |
+ >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}] |
99 |
+ >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}] |
100 |
+ >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}] |
101 |
+ >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}] |
102 |
+ !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}] |
103 |
+ >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] |
104 |
+ >=dev-python/pytz-2013.6[${PYTHON_USEDEP}] |
105 |
+ >=dev-python/requests-2.10.0[${PYTHON_USEDEP}] |
106 |
+ !~dev-python/requests-2.12.2[${PYTHON_USEDEP}] |
107 |
+ >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] |
108 |
+ !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] |
109 |
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}] |
110 |
+ !~dev-python/routes-2.0[${PYTHON_USEDEP}] |
111 |
+ !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')] |
112 |
+ !~dev-python/routes-2.3[${PYTHON_USEDEP}] |
113 |
+ >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}] |
114 |
+ >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}] |
115 |
+ !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}] |
116 |
+ !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}] |
117 |
+ >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}] |
118 |
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}] |
119 |
+ sqlite? ( |
120 |
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}] |
121 |
+ <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}] |
122 |
+ ) |
123 |
+ mysql? ( |
124 |
+ >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] |
125 |
+ !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}] |
126 |
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
127 |
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
128 |
+ ) |
129 |
+ postgres? ( |
130 |
+ >=dev-python/psycopg-2.5.0 |
131 |
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}] |
132 |
+ <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}] |
133 |
+ ) |
134 |
+ >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] |
135 |
+ >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}] |
136 |
+ ~dev-python/suds-0.6[${PYTHON_USEDEP}] |
137 |
+ >=dev-python/webob-1.6.0[${PYTHON_USEDEP}] |
138 |
+ >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}] |
139 |
+ >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] |
140 |
+ >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}] |
141 |
+ >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}] |
142 |
+ >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}] |
143 |
+ >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] |
144 |
+ >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}] |
145 |
+ iscsi? ( |
146 |
+ tgt? ( sys-block/tgt ) |
147 |
+ sys-block/open-iscsi |
148 |
+ ) |
149 |
+ lvm? ( sys-fs/lvm2 ) |
150 |
+ memcached? ( net-misc/memcached ) |
151 |
+ app-emulation/qemu |
152 |
+ sys-fs/sysfsutils" |
153 |
+# qemu is needed for image conversion |
154 |
+ |
155 |
+#PATCHES=( |
156 |
+#) |
157 |
+ |
158 |
+pkg_pretend() { |
159 |
+ linux-info_pkg_setup |
160 |
+ CONFIG_CHECK_MODULES="" |
161 |
+ if use tcp; then |
162 |
+ CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " |
163 |
+ fi |
164 |
+ if use rdma; then |
165 |
+ CONFIG_CHECK_MODULES+="INFINIBAND_ISER " |
166 |
+ fi |
167 |
+ if use infiniband; then |
168 |
+ CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS" |
169 |
+ fi |
170 |
+ if linux_config_exists; then |
171 |
+ for module in ${CONFIG_CHECK_MODULES}; do |
172 |
+ linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" |
173 |
+ done |
174 |
+ fi |
175 |
+} |
176 |
+ |
177 |
+pkg_setup() { |
178 |
+ enewgroup cinder |
179 |
+ enewuser cinder -1 -1 /var/lib/cinder cinder |
180 |
+} |
181 |
+ |
182 |
+python_prepare_all() { |
183 |
+ sed -i '/^hacking/d' test-requirements.txt || die |
184 |
+ distutils-r1_python_prepare_all |
185 |
+} |
186 |
+ |
187 |
+python_test() { |
188 |
+ # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727 |
189 |
+ nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7" |
190 |
+} |
191 |
+ |
192 |
+python_install_all() { |
193 |
+ distutils-r1_python_install_all |
194 |
+ keepdir /etc/cinder |
195 |
+ dodir /etc/cinder/rootwrap.d |
196 |
+ |
197 |
+ for svc in api scheduler volume; do |
198 |
+ newinitd "${FILESDIR}/cinder.initd" cinder-${svc} |
199 |
+ done |
200 |
+ |
201 |
+ insinto /etc/cinder |
202 |
+ insopts -m0640 -o cinder -g cinder |
203 |
+ doins "etc/cinder/api-httpd.conf" |
204 |
+ doins "etc/cinder/logging_sample.conf" |
205 |
+ doins "etc/cinder/rootwrap.conf" |
206 |
+ doins "etc/cinder/api-paste.ini" |
207 |
+ newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json" |
208 |
+ newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample" |
209 |
+ insinto /etc/cinder/rootwrap.d |
210 |
+ newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters" |
211 |
+ |
212 |
+ dodir /var/log/cinder |
213 |
+ fowners cinder:cinder /var/log/cinder |
214 |
+ |
215 |
+ #add sudoers definitions for user nova |
216 |
+ insinto /etc/sudoers.d/ |
217 |
+ insopts -m 0440 -o root -g root |
218 |
+ newins "${FILESDIR}/cinder.sudoersd" cinder |
219 |
+} |
220 |
+ |
221 |
+pkg_postinst() { |
222 |
+ if use iscsi ; then |
223 |
+ elog "Cinder needs tgtd to be installed and running to work with iscsi" |
224 |
+ elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf" |
225 |
+ fi |
226 |
+} |
227 |
|
228 |
diff --git a/sys-cluster/cinder/metadata.xml b/sys-cluster/cinder/metadata.xml |
229 |
index 1ad12f6ac35..997957ff34f 100644 |
230 |
--- a/sys-cluster/cinder/metadata.xml |
231 |
+++ b/sys-cluster/cinder/metadata.xml |
232 |
@@ -7,17 +7,17 @@ |
233 |
</maintainer> |
234 |
<longdescription lang="en"> |
235 |
Cinder is the OpenStack Block storage service. |
236 |
- This is a spin out of nova-volumes. |
237 |
+ This is a spin out of nova-volumes. |
238 |
</longdescription> |
239 |
<use> |
240 |
<flag name="api">Installs the initscripts for the cinder api service</flag> |
241 |
<flag name="iscsi">Allow using an iSCSI remote storage server as pool for disk image storage</flag> |
242 |
<flag name="lvm">Allow using the Logical Volume Manager (<pkg>sys-fs/lvm2</pkg>) as pool for disk image storage</flag> |
243 |
<flag name="memcached">Installs the memcached server</flag> |
244 |
- <flag name="rdma">Enable rdma storage backend support</flag> |
245 |
+ <flag name="rdma">Enable rdma storage backend support</flag> |
246 |
<flag name="scheduler">Installs the initscripts for the cinder scheduler service</flag> |
247 |
- <flag name="tcp">Enables tcp support for the iscsi backend</flag> |
248 |
- <flag name="tgt">Enable tgt storage backend support</flag> |
249 |
+ <flag name="tcp">Enables tcp support for the iscsi backend</flag> |
250 |
+ <flag name="tgt">Enable tgt storage backend support</flag> |
251 |
<flag name="volume">Installs the initscripts for the cinder volume service</flag> |
252 |
</use> |
253 |
<upstream> |