Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/cinder/, sys-cluster/cinder/files/, ...
Date: Sun, 28 Jan 2018 04:13:42
Message-Id: 1517112784.6799a9e358e3cc74e0ebc01ea6186693bb05e99b.prometheanfire@gentoo
1 commit: 6799a9e358e3cc74e0ebc01ea6186693bb05e99b
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 28 03:48:34 2018 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 28 04:13:04 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6799a9e3
7
8 sys-cluster/cinder: remove ocata
9
10 Package-Manager: Portage-2.3.19, Repoman-2.3.6
11
12 sys-cluster/cinder/Manifest | 8 -
13 sys-cluster/cinder/cinder-10.0.6.ebuild | 193 -------------------
14 sys-cluster/cinder/cinder-11.0.2.ebuild | 2 +-
15 sys-cluster/cinder/cinder-2016.2.9999.ebuild | 194 -------------------
16 sys-cluster/cinder/cinder-2017.1.9999.ebuild | 194 -------------------
17 sys-cluster/cinder/cinder-2017.2.9999.ebuild | 4 +-
18 sys-cluster/cinder/cinder-9.1.4.ebuild | 195 -------------------
19 sys-cluster/cinder/files/cinder.initd | 16 +-
20 sys-cluster/cinder/files/cinder.initd-2 | 17 --
21 .../cinder/files/etc.liberty/api-httpd.conf | 16 --
22 sys-cluster/cinder/files/etc.liberty/api-paste.ini | 60 ------
23 .../cinder/files/etc.liberty/logging_sample.conf | 93 ---------
24 sys-cluster/cinder/files/etc.liberty/policy.json | 99 ----------
25 sys-cluster/cinder/files/etc.liberty/rootwrap.conf | 27 ---
26 .../files/etc.liberty/rootwrap.d/volume.filters | 207 ---------------------
27 15 files changed, 8 insertions(+), 1317 deletions(-)
28
29 diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
30 index 51ab6a5f0fa..e462e21ce38 100644
31 --- a/sys-cluster/cinder/Manifest
32 +++ b/sys-cluster/cinder/Manifest
33 @@ -1,10 +1,2 @@
34 -DIST cinder-10.0.6.tar.gz 4624145 BLAKE2B c3e12c4f49b9b06b674d12354e867328eaaef565930ac1d3078c4611f14f61463d458a2bfd679a0a6cb8ce5b677b037618a800d229bf352797b20b57c8383e6b SHA512 28c84260909d0c1a9b0cd6a7409dad3e09d0d7bd662b8ca61c6c3ca04fb797723bc0f4df7db3a6951d1ce354a84b907bf1832190c02a5992c8ac70cf95fb00b9
35 DIST cinder-11.0.2.tar.gz 5794973 BLAKE2B a7b59afbe3e27a2fde28a3dcb2ba3707c67223ae7e98cb34d0ac92beb16ab8f10c07f22fda091c9db9a02fd2eff4769a6e574a94cb19df1e9506c36321a12014 SHA512 6340150aa010a4372a7e51dc976974839f89b180eef61c9307c5b477dae98c8629a3f54cbc3d114dca28ca75c715930357cfc96d08f80acaabacee8f8c0bf3a6
36 -DIST cinder-9.1.4.tar.gz 4195597 BLAKE2B a35b3c588d0589baf2887ebe6c9c6c4803a6819476c822fa3d314b8cb74f4fabae19cf224a3b9dc2c6255338eff6413be189e3555f5e49578451604f091169ba SHA512 8039d5208296ea54fc869fb05dd91451ac3575eb3dd2ed97d0c63120d18b67b02b835a849cd1ec3dae349920895e13665c15a6daa53f67138823053c49ab87a9
37 -DIST newton-cinder-policy.json 6412 BLAKE2B 90c6a2733b0c20a95375e9a588c311e48f9f189aff43ce9a89a808e6693b2f14ca0485fbea4d000674414081171989dc8050c0079e4e137f728decbdf8a5cec0 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56
38 -DIST newton-cinder-volume.filters 11025 BLAKE2B ac87bb2aaab3bd492ea2f7ce7526e7ff444778ce516c71bce769f2cff1badebe7cbf520c604a0193b03f615e0d34dff21cee34f4798cc03151711b205924728b SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d
39 -DIST newton-cinder.conf.sample 50793 BLAKE2B 4537ae2f7dc70fd6711a0a07a301b036af8eab72372317a96355956fa05f67562374a5ad45b60d84d569f5c52a3d36b34fde4d2defcde4d11e69c99a64e22997 SHA512 bf3b5fa262d7df57ca8a496724df449eb6c49ea951c1384b216af334db7cb948af5f7a5f24ddcebd4c80cca40da65e8aaa3a65f09ae2e184794ec1bf9bf466db
40 -DIST ocata-cinder-policy.json 6614 BLAKE2B 7b47da231386543e6fa438796a747882daa8b39453b6940c9ce454e3989ccc76cec9aebdc96b0820786cad978c6ed834bca6e25f812c8e07028edf100dfba299 SHA512 6a3da28674e7bf828a2be8de0b41e6abe59567d0abf2a41781580ba611ca888e072960f3e702e834a1599e6bbb49beb1cd37f7a32e35afaf8dfc73f2852e2302
41 -DIST ocata-cinder-volume.filters 11067 BLAKE2B 84e642296960124126155ab725cbbb1754d8303bcb97d85117123671fbf2e96e84c1b38f74d88f6adda9a7f89a784669f45dcb9fadabdace30fc4f53c89d34e5 SHA512 9600ca77a63db04844ab9d658ffd0d97abe1c669d91f69d126b364b2700d749cd45d7df1e31ffd7e80698157e9267c3138cae098f36d77995bab73afdf32ff9f
42 -DIST ocata-cinder.conf.sample 173024 BLAKE2B 11c53b4507d8ad53cfb49fa4c79760f2d3d8bf65f142a4bdec6731e732e5503a217ae5ab1c7220f73fea4ff2d91b5a84b6230484df672b5022c66d7f4f3eefa0 SHA512 bbecf45ad20b3193023a137b5c3237dfc15bd6a232dda5de631096bf55916eb0fffba7506eeffdc1a3c848ac042cb286dea44387ff0eef84ec7bbcaffb4aa58e
43 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
44
45 diff --git a/sys-cluster/cinder/cinder-10.0.6.ebuild b/sys-cluster/cinder/cinder-10.0.6.ebuild
46 deleted file mode 100644
47 index 50016f1ae5d..00000000000
48 --- a/sys-cluster/cinder/cinder-10.0.6.ebuild
49 +++ /dev/null
50 @@ -1,193 +0,0 @@
51 -# Copyright 1999-2017 Gentoo Foundation
52 -# Distributed under the terms of the GNU General Public License v2
53 -
54 -EAPI=6
55 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
56 -
57 -inherit distutils-r1 eutils linux-info user
58 -
59 -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
60 -HOMEPAGE="https://launchpad.net/cinder"
61 -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample
62 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json
63 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters
64 -https://tarballs.openstack.org/${PN}/${P}.tar.gz"
65 -
66 -LICENSE="Apache-2.0"
67 -SLOT="0"
68 -KEYWORDS="amd64 ~arm64 x86"
69 -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
70 -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
71 -
72 -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
73 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
74 - ${CDEPEND}
75 - app-admin/sudo"
76 -
77 -RDEPEND="
78 - ${CDEPEND}
79 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
80 - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
81 - dev-python/enum34[$(python_gen_usedep 'python2_7')]
82 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
83 - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
84 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
85 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
86 - virtual/python-ipaddress[${PYTHON_USEDEP}]
87 - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
88 - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
89 - >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
90 - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
91 - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
92 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
93 - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
94 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
95 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
96 - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
97 - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
98 - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
99 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
100 - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
101 - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
102 - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
103 - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
104 - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
105 - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
106 - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
107 - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
108 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
109 - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
110 - dev-python/paste[${PYTHON_USEDEP}]
111 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
112 - >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
113 - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
114 - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
115 - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
116 - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
117 - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
118 - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
119 - !~dev-python/python-novaclient-7.0.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.10.0[${PYTHON_USEDEP}]
123 - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
124 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
125 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
126 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
127 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
128 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
129 - !~dev-python/routes-2.3[${PYTHON_USEDEP}]
130 - >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
131 - >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
132 - !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
133 - !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
134 - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
135 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
136 - sqlite? (
137 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
138 - <dev-python/sqlalchemy-1.1.0[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.0[${PYTHON_USEDEP}]
145 - )
146 - postgres? (
147 - >=dev-python/psycopg-2.5.0
148 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
149 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
150 - )
151 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
152 - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
153 - ~dev-python/suds-0.6[${PYTHON_USEDEP}]
154 - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
155 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
156 - >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
157 - >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
158 - >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
159 - >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
160 - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
161 - >=dev-python/castellan-0.4.0[${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 - distutils-r1_python_prepare_all
202 -}
203 -
204 -python_test() {
205 - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
206 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
207 -}
208 -
209 -python_install_all() {
210 - distutils-r1_python_install_all
211 - keepdir /etc/cinder
212 - dodir /etc/cinder/rootwrap.d
213 -
214 - for svc in api scheduler volume; do
215 - newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
216 - done
217 -
218 - insinto /etc/cinder
219 - insopts -m0640 -o cinder -g cinder
220 - doins "etc/cinder/api-httpd.conf"
221 - doins "etc/cinder/logging_sample.conf"
222 - doins "etc/cinder/rootwrap.conf"
223 - doins "etc/cinder/api-paste.ini"
224 - newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json"
225 - newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample"
226 - insinto /etc/cinder/rootwrap.d
227 - newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters"
228 -
229 - dodir /var/log/cinder
230 - fowners cinder:cinder /var/log/cinder
231 -
232 - #add sudoers definitions for user nova
233 - insinto /etc/sudoers.d/
234 - insopts -m 0440 -o root -g root
235 - newins "${FILESDIR}/cinder.sudoersd" cinder
236 -}
237 -
238 -pkg_postinst() {
239 - if use iscsi ; then
240 - elog "Cinder needs tgtd to be installed and running to work with iscsi"
241 - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
242 - fi
243 -}
244
245 diff --git a/sys-cluster/cinder/cinder-11.0.2.ebuild b/sys-cluster/cinder/cinder-11.0.2.ebuild
246 index ed819298e2b..b0f15626d2d 100644
247 --- a/sys-cluster/cinder/cinder-11.0.2.ebuild
248 +++ b/sys-cluster/cinder/cinder-11.0.2.ebuild
249 @@ -177,7 +177,7 @@ python_install_all() {
250 dodir /etc/cinder/rootwrap.d
251
252 for svc in api scheduler volume; do
253 - newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc}
254 + newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
255 done
256
257 insinto /etc/cinder
258
259 diff --git a/sys-cluster/cinder/cinder-2016.2.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
260 deleted file mode 100644
261 index b0cc1c89ab4..00000000000
262 --- a/sys-cluster/cinder/cinder-2016.2.9999.ebuild
263 +++ /dev/null
264 @@ -1,194 +0,0 @@
265 -# Copyright 1999-2017 Gentoo Foundation
266 -# Distributed under the terms of the GNU General Public License v2
267 -
268 -EAPI=6
269 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
270 -
271 -inherit distutils-r1 eutils git-r3 linux-info user
272 -
273 -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
274 -HOMEPAGE="https://launchpad.net/cinder"
275 -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample
276 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json
277 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters"
278 -EGIT_REPO_URI="https://github.com/openstack/cinder.git"
279 -EGIT_BRANCH="stable/newton"
280 -
281 -LICENSE="Apache-2.0"
282 -SLOT="0"
283 -KEYWORDS=""
284 -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
285 -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
286 -
287 -CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
288 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
289 - ${CDEPEND}
290 - app-admin/sudo"
291 -
292 -RDEPEND="
293 - ${CDEPEND}
294 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
295 - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
296 - dev-python/enum34[$(python_gen_usedep 'python2_7')]
297 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
298 - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
299 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
300 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
301 - virtual/python-ipaddress[${PYTHON_USEDEP}]
302 - >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
303 - >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
304 - !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
305 - !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
306 - >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
307 - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
308 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
309 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
310 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
311 - >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
312 - >=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
313 - >=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
314 - >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
315 - >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
316 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
317 - >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
318 - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
319 - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
320 - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
321 - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
322 - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
323 - >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
324 - >=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
325 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
326 - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
327 - dev-python/paste[${PYTHON_USEDEP}]
328 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
329 - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
330 - >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
331 - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
332 - >=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
333 - !~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
334 - >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
335 - !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
336 - >=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
337 - !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
338 - >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
339 - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
340 - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
341 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
342 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
343 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
344 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
345 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
346 - !~dev-python/routes-2.3[${PYTHON_USEDEP}]
347 - >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
348 - >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
349 - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
350 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
351 - sqlite? (
352 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
353 - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
354 - )
355 - mysql? (
356 - >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
357 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
358 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
359 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
360 - )
361 - postgres? (
362 - >=dev-python/psycopg-2.5.0
363 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
364 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
365 - )
366 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
367 - >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
368 - ~dev-python/suds-0.6[${PYTHON_USEDEP}]
369 - >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
370 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
371 - >=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}]
372 - >=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
373 - >=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
374 - >=dev-python/tooz-1.28.0[${PYTHON_USEDEP}]
375 - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
376 - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
377 - iscsi? (
378 - tgt? ( sys-block/tgt )
379 - sys-block/open-iscsi
380 - )
381 - lvm? ( sys-fs/lvm2 )
382 - memcached? ( net-misc/memcached )
383 - app-emulation/qemu
384 - sys-fs/sysfsutils"
385 -# qemu is needed for image conversion
386 -
387 -#PATCHES=(
388 -#)
389 -
390 -pkg_pretend() {
391 - linux-info_pkg_setup
392 - CONFIG_CHECK_MODULES=""
393 - if use tcp; then
394 - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
395 - fi
396 - if use rdma; then
397 - CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
398 - fi
399 - if use infiniband; then
400 - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
401 - fi
402 - if linux_config_exists; then
403 - for module in ${CONFIG_CHECK_MODULES}; do
404 - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
405 - done
406 - fi
407 -}
408 -
409 -pkg_setup() {
410 - enewgroup cinder
411 - enewuser cinder -1 -1 /var/lib/cinder cinder
412 -}
413 -
414 -python_prepare_all() {
415 - sed -i '/^hacking/d' test-requirements.txt || die
416 - distutils-r1_python_prepare_all
417 -}
418 -
419 -python_test() {
420 - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
421 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
422 -}
423 -
424 -python_install_all() {
425 - distutils-r1_python_install_all
426 - keepdir /etc/cinder
427 - dodir /etc/cinder/rootwrap.d
428 -
429 - for svc in api scheduler volume; do
430 - newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
431 - done
432 -
433 - insinto /etc/cinder
434 - insopts -m0640 -o cinder -g cinder
435 - doins "etc/cinder/api-httpd.conf"
436 - doins "etc/cinder/logging_sample.conf"
437 - doins "etc/cinder/rootwrap.conf"
438 - doins "etc/cinder/api-paste.ini"
439 - newins "${DISTDIR}/newton-cinder-policy.json" "policy.json"
440 - newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample"
441 - insinto /etc/cinder/rootwrap.d
442 - newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters"
443 -
444 - dodir /var/log/cinder
445 - fowners cinder:cinder /var/log/cinder
446 -
447 - #add sudoers definitions for user nova
448 - insinto /etc/sudoers.d/
449 - insopts -m 0440 -o root -g root
450 - newins "${FILESDIR}/cinder.sudoersd" cinder
451 -}
452 -
453 -pkg_postinst() {
454 - if use iscsi ; then
455 - elog "Cinder needs tgtd to be installed and running to work with iscsi"
456 - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
457 - fi
458 -}
459
460 diff --git a/sys-cluster/cinder/cinder-2017.1.9999.ebuild b/sys-cluster/cinder/cinder-2017.1.9999.ebuild
461 deleted file mode 100644
462 index f7d1edd7008..00000000000
463 --- a/sys-cluster/cinder/cinder-2017.1.9999.ebuild
464 +++ /dev/null
465 @@ -1,194 +0,0 @@
466 -# Copyright 1999-2017 Gentoo Foundation
467 -# Distributed under the terms of the GNU General Public License v2
468 -
469 -EAPI=6
470 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
471 -
472 -inherit distutils-r1 eutils git-r3 linux-info user
473 -
474 -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
475 -HOMEPAGE="https://launchpad.net/cinder"
476 -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample
477 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json
478 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters"
479 -EGIT_REPO_URI="https://github.com/openstack/cinder.git"
480 -EGIT_BRANCH="stable/ocata"
481 -
482 -LICENSE="Apache-2.0"
483 -SLOT="0"
484 -KEYWORDS=""
485 -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
486 -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
487 -
488 -CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
489 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
490 - ${CDEPEND}
491 - app-admin/sudo"
492 -
493 -RDEPEND="
494 - ${CDEPEND}
495 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
496 - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
497 - dev-python/enum34[$(python_gen_usedep 'python2_7')]
498 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
499 - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
500 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
501 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
502 - virtual/python-ipaddress[${PYTHON_USEDEP}]
503 - >=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
504 - >=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
505 - >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
506 - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
507 - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
508 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
509 - !~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
510 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
511 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
512 - >=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
513 - >=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
514 - >=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
515 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
516 - >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
517 - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
518 - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
519 - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
520 - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
521 - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
522 - >=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
523 - >=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
524 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
525 - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
526 - dev-python/paste[${PYTHON_USEDEP}]
527 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
528 - >=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
529 - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
530 - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
531 - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
532 - >=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
533 - >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
534 - >=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
535 - !~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
536 - >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
537 - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
538 - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
539 - !~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
540 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
541 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
542 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
543 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
544 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
545 - !~dev-python/routes-2.3[${PYTHON_USEDEP}]
546 - >=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
547 - >=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
548 - !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
549 - !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
550 - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
551 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
552 - sqlite? (
553 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
554 - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
555 - )
556 - mysql? (
557 - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
558 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
559 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
560 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
561 - )
562 - postgres? (
563 - >=dev-python/psycopg-2.5.0
564 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
565 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
566 - )
567 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
568 - >=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
569 - ~dev-python/suds-0.6[${PYTHON_USEDEP}]
570 - >=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
571 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
572 - >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
573 - >=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
574 - >=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
575 - >=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
576 - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
577 - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
578 - iscsi? (
579 - tgt? ( sys-block/tgt )
580 - sys-block/open-iscsi
581 - )
582 - lvm? ( sys-fs/lvm2 )
583 - memcached? ( net-misc/memcached )
584 - app-emulation/qemu
585 - sys-fs/sysfsutils"
586 -# qemu is needed for image conversion
587 -
588 -#PATCHES=(
589 -#)
590 -
591 -pkg_pretend() {
592 - linux-info_pkg_setup
593 - CONFIG_CHECK_MODULES=""
594 - if use tcp; then
595 - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
596 - fi
597 - if use rdma; then
598 - CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
599 - fi
600 - if use infiniband; then
601 - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
602 - fi
603 - if linux_config_exists; then
604 - for module in ${CONFIG_CHECK_MODULES}; do
605 - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
606 - done
607 - fi
608 -}
609 -
610 -pkg_setup() {
611 - enewgroup cinder
612 - enewuser cinder -1 -1 /var/lib/cinder cinder
613 -}
614 -
615 -python_prepare_all() {
616 - sed -i '/^hacking/d' test-requirements.txt || die
617 - distutils-r1_python_prepare_all
618 -}
619 -
620 -python_test() {
621 - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
622 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
623 -}
624 -
625 -python_install_all() {
626 - distutils-r1_python_install_all
627 - keepdir /etc/cinder
628 - dodir /etc/cinder/rootwrap.d
629 -
630 - for svc in api scheduler volume; do
631 - newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
632 - done
633 -
634 - insinto /etc/cinder
635 - insopts -m0640 -o cinder -g cinder
636 - doins "etc/cinder/api-httpd.conf"
637 - doins "etc/cinder/logging_sample.conf"
638 - doins "etc/cinder/rootwrap.conf"
639 - doins "etc/cinder/api-paste.ini"
640 - newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json"
641 - newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample"
642 - insinto /etc/cinder/rootwrap.d
643 - newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters"
644 -
645 - dodir /var/log/cinder
646 - fowners cinder:cinder /var/log/cinder
647 -
648 - #add sudoers definitions for user nova
649 - insinto /etc/sudoers.d/
650 - insopts -m 0440 -o root -g root
651 - newins "${FILESDIR}/cinder.sudoersd" cinder
652 -}
653 -
654 -pkg_postinst() {
655 - if use iscsi ; then
656 - elog "Cinder needs tgtd to be installed and running to work with iscsi"
657 - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
658 - fi
659 -}
660
661 diff --git a/sys-cluster/cinder/cinder-2017.2.9999.ebuild b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
662 index 9db27e401ad..2f6ae69b264 100644
663 --- a/sys-cluster/cinder/cinder-2017.2.9999.ebuild
664 +++ b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
665 @@ -1,4 +1,4 @@
666 -# Copyright 1999-2017 Gentoo Foundation
667 +# Copyright 1999-2018 Gentoo Foundation
668 # Distributed under the terms of the GNU General Public License v2
669
670 EAPI=6
671 @@ -178,7 +178,7 @@ python_install_all() {
672 dodir /etc/cinder/rootwrap.d
673
674 for svc in api scheduler volume; do
675 - newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc}
676 + newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
677 done
678
679 insinto /etc/cinder
680
681 diff --git a/sys-cluster/cinder/cinder-9.1.4.ebuild b/sys-cluster/cinder/cinder-9.1.4.ebuild
682 deleted file mode 100644
683 index a4f99f38643..00000000000
684 --- a/sys-cluster/cinder/cinder-9.1.4.ebuild
685 +++ /dev/null
686 @@ -1,195 +0,0 @@
687 -# Copyright 1999-2017 Gentoo Foundation
688 -# Distributed under the terms of the GNU General Public License v2
689 -
690 -EAPI=6
691 -PYTHON_COMPAT=( python2_7 python3_4 )
692 -
693 -inherit distutils-r1 eutils linux-info user
694 -
695 -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
696 -HOMEPAGE="https://launchpad.net/cinder"
697 -SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample
698 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json
699 -https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters
700 -https://tarballs.openstack.org/${PN}/${P}.tar.gz"
701 -
702 -LICENSE="Apache-2.0"
703 -SLOT="0"
704 -KEYWORDS="amd64 ~arm64 x86"
705 -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
706 -REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
707 -
708 -CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
709 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
710 - ${CDEPEND}
711 - app-admin/sudo"
712 -
713 -RDEPEND="
714 - ${CDEPEND}
715 - >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
716 - >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
717 - dev-python/enum34[$(python_gen_usedep 'python2_7')]
718 - >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
719 - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
720 - >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
721 - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
722 - virtual/python-ipaddress[${PYTHON_USEDEP}]
723 - >=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
724 - >=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
725 - !~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
726 - !~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
727 - >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
728 - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
729 - >=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
730 - >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
731 - >=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
732 - >=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
733 - >=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
734 - >=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
735 - >=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
736 - >=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
737 - >=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
738 - >=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
739 - >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
740 - >=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
741 - >=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
742 - >=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
743 - >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
744 - >=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
745 - >=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
746 - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
747 - >=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
748 - dev-python/paste[${PYTHON_USEDEP}]
749 - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
750 - >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
751 - >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
752 - >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
753 - >=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
754 - !~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
755 - >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
756 - !~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
757 - >=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
758 - !~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
759 - >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
760 - >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
761 - >=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
762 - >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
763 - !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
764 - >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
765 - !~dev-python/routes-2.0[${PYTHON_USEDEP}]
766 - !~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
767 - !~dev-python/routes-2.3[${PYTHON_USEDEP}]
768 - >=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
769 - >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
770 - !~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
771 - !~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
772 - >=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
773 - >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
774 - sqlite? (
775 - >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
776 - <dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
777 - )
778 - mysql? (
779 - >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
780 - !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
781 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
782 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
783 - )
784 - postgres? (
785 - >=dev-python/psycopg-2.5.0
786 - >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
787 - <dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
788 - )
789 - >=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
790 - >=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
791 - ~dev-python/suds-0.6[${PYTHON_USEDEP}]
792 - >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
793 - >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
794 - >=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}]
795 - >=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
796 - >=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
797 - >=dev-python/tooz-1.28.0[${PYTHON_USEDEP}]
798 - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
799 - >=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
800 - iscsi? (
801 - tgt? ( sys-block/tgt )
802 - sys-block/open-iscsi
803 - )
804 - lvm? ( sys-fs/lvm2 )
805 - memcached? ( net-misc/memcached )
806 - app-emulation/qemu
807 - sys-fs/sysfsutils"
808 -# qemu is needed for image conversion
809 -
810 -#PATCHES=(
811 -#)
812 -
813 -pkg_pretend() {
814 - linux-info_pkg_setup
815 - CONFIG_CHECK_MODULES=""
816 - if use tcp; then
817 - CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
818 - fi
819 - if use rdma; then
820 - CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
821 - fi
822 - if use infiniband; then
823 - CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
824 - fi
825 - if linux_config_exists; then
826 - for module in ${CONFIG_CHECK_MODULES}; do
827 - linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
828 - done
829 - fi
830 -}
831 -
832 -pkg_setup() {
833 - enewgroup cinder
834 - enewuser cinder -1 -1 /var/lib/cinder cinder
835 -}
836 -
837 -python_prepare_all() {
838 - sed -i '/^hacking/d' test-requirements.txt || die
839 - distutils-r1_python_prepare_all
840 -}
841 -
842 -python_test() {
843 - # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
844 - nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
845 -}
846 -
847 -python_install_all() {
848 - distutils-r1_python_install_all
849 - keepdir /etc/cinder
850 - dodir /etc/cinder/rootwrap.d
851 -
852 - for svc in api scheduler volume; do
853 - newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
854 - done
855 -
856 - insinto /etc/cinder
857 - insopts -m0640 -o cinder -g cinder
858 - doins "etc/cinder/api-httpd.conf"
859 - doins "etc/cinder/logging_sample.conf"
860 - doins "etc/cinder/rootwrap.conf"
861 - doins "etc/cinder/api-paste.ini"
862 - newins "${DISTDIR}/newton-cinder-policy.json" "policy.json"
863 - newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample"
864 - insinto /etc/cinder/rootwrap.d
865 - newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters"
866 -
867 - dodir /var/log/cinder
868 - fowners cinder:cinder /var/log/cinder
869 -
870 - #add sudoers definitions for user nova
871 - insinto /etc/sudoers.d/
872 - insopts -m 0440 -o root -g root
873 - newins "${FILESDIR}/cinder.sudoersd" cinder
874 -}
875 -
876 -pkg_postinst() {
877 - if use iscsi ; then
878 - elog "Cinder needs tgtd to be installed and running to work with iscsi"
879 - elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
880 - fi
881 -}
882
883 diff --git a/sys-cluster/cinder/files/cinder.initd b/sys-cluster/cinder/files/cinder.initd
884 index 0c86345a8a1..b6a844a93c7 100644
885 --- a/sys-cluster/cinder/files/cinder.initd
886 +++ b/sys-cluster/cinder/files/cinder.initd
887 @@ -1,23 +1,17 @@
888 #!/sbin/openrc-run
889 -# Copyright 1999-2015 Gentoo Foundation
890 +# Copyright 1999-2018 Gentoo Foundation
891 # Distributed under the terms of the GNU General Public License v2
892
893 description="Starts ${SVCNAME} service for OpenStack"
894
895 command=/usr/bin/${SVCNAME}
896 command_background=yes
897 -command_args="--config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/${SVCNAME}.log"
898 -pidfile=/var/run/cinder/${SVCNAME}.pid
899 +command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log"
900 +command_user="${CINDER_USER:-cinder}"
901 +pidfile=/run/${SVCNAME}.pid
902 required_files=/etc/cinder/cinder.conf
903 -
904 -start_stop_daemon_args="--quiet --user ${CINDER_USER:-cinder}"
905 +retry="SIGTERM/30"
906
907 depend() {
908 need net
909 }
910 -
911 -start_pre() {
912 - checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_RUN:-/var/run/cinder}
913 - checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_LOCK:-/var/lock/cinder}
914 -}
915 -
916
917 diff --git a/sys-cluster/cinder/files/cinder.initd-2 b/sys-cluster/cinder/files/cinder.initd-2
918 deleted file mode 100644
919 index 31584dee9d2..00000000000
920 --- a/sys-cluster/cinder/files/cinder.initd-2
921 +++ /dev/null
922 @@ -1,17 +0,0 @@
923 -#!/sbin/openrc-run
924 -# Copyright 1999-2017 Gentoo Foundation
925 -# Distributed under the terms of the GNU General Public License v2
926 -
927 -description="Starts ${SVCNAME} service for OpenStack"
928 -
929 -command=/usr/bin/${SVCNAME}
930 -command_background=yes
931 -command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log"
932 -command_user="${CINDER_USER:-cinder}"
933 -pidfile=/run/${SVCNAME}.pid
934 -required_files=/etc/cinder/cinder.conf
935 -retry="SIGTERM/30"
936 -
937 -depend() {
938 - need net
939 -}
940
941 diff --git a/sys-cluster/cinder/files/etc.liberty/api-httpd.conf b/sys-cluster/cinder/files/etc.liberty/api-httpd.conf
942 deleted file mode 100644
943 index f3555477acc..00000000000
944 --- a/sys-cluster/cinder/files/etc.liberty/api-httpd.conf
945 +++ /dev/null
946 @@ -1,16 +0,0 @@
947 -Listen 8776
948 -LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" cinder_combined
949 -
950 -<VirtualHost *:8776>
951 - WSGIDaemonProcess osapi_volume processes=2 threads=1 user=cinder display-name=%{GROUP}
952 - WSGIProcessGroup osapi_volume
953 - WSGIScriptAlias / /var/www/cgi-bin/cinder/osapi_volume
954 - WSGIApplicationGroup %{GLOBAL}
955 - WSGIPassAuthorization On
956 - <IfVersion >= 2.4>
957 - ErrorLogFormat "%{cu}t %M"
958 - </IfVersion>
959 - ErrorLog /var/log/apache2/cinder_error.log
960 - CustomLog /var/log/apache2/cinder.log cinder_combined
961 -
962 -</VirtualHost>
963
964 diff --git a/sys-cluster/cinder/files/etc.liberty/api-paste.ini b/sys-cluster/cinder/files/etc.liberty/api-paste.ini
965 deleted file mode 100644
966 index b2822b044db..00000000000
967 --- a/sys-cluster/cinder/files/etc.liberty/api-paste.ini
968 +++ /dev/null
969 @@ -1,60 +0,0 @@
970 -#############
971 -# OpenStack #
972 -#############
973 -
974 -[composite:osapi_volume]
975 -use = call:cinder.api:root_app_factory
976 -/: apiversions
977 -/v1: openstack_volume_api_v1
978 -/v2: openstack_volume_api_v2
979 -
980 -[composite:openstack_volume_api_v1]
981 -use = call:cinder.api.middleware.auth:pipeline_factory
982 -noauth = request_id faultwrap sizelimit osprofiler noauth apiv1
983 -keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
984 -keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
985 -
986 -[composite:openstack_volume_api_v2]
987 -use = call:cinder.api.middleware.auth:pipeline_factory
988 -noauth = request_id faultwrap sizelimit osprofiler noauth apiv2
989 -keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
990 -keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
991 -
992 -[filter:request_id]
993 -paste.filter_factory = oslo_middleware.request_id:RequestId.factory
994 -
995 -[filter:faultwrap]
996 -paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
997 -
998 -[filter:osprofiler]
999 -paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
1000 -hmac_keys = SECRET_KEY
1001 -enabled = yes
1002 -
1003 -[filter:noauth]
1004 -paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
1005 -
1006 -[filter:sizelimit]
1007 -paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory
1008 -
1009 -[app:apiv1]
1010 -paste.app_factory = cinder.api.v1.router:APIRouter.factory
1011 -
1012 -[app:apiv2]
1013 -paste.app_factory = cinder.api.v2.router:APIRouter.factory
1014 -
1015 -[pipeline:apiversions]
1016 -pipeline = faultwrap osvolumeversionapp
1017 -
1018 -[app:osvolumeversionapp]
1019 -paste.app_factory = cinder.api.versions:Versions.factory
1020 -
1021 -##########
1022 -# Shared #
1023 -##########
1024 -
1025 -[filter:keystonecontext]
1026 -paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
1027 -
1028 -[filter:authtoken]
1029 -paste.filter_factory = keystonemiddleware.auth_token:filter_factory
1030
1031 diff --git a/sys-cluster/cinder/files/etc.liberty/logging_sample.conf b/sys-cluster/cinder/files/etc.liberty/logging_sample.conf
1032 deleted file mode 100644
1033 index f9a8deb1b3c..00000000000
1034 --- a/sys-cluster/cinder/files/etc.liberty/logging_sample.conf
1035 +++ /dev/null
1036 @@ -1,93 +0,0 @@
1037 -[loggers]
1038 -keys = root, cinder, taskflow, cinder_flow_utils
1039 -
1040 -[handlers]
1041 -keys = stderr, stdout, watchedfile, syslog, tasks, null
1042 -
1043 -[formatters]
1044 -keys = context, default
1045 -
1046 -[logger_root]
1047 -level = WARNING
1048 -handlers = null
1049 -
1050 -[logger_cinder]
1051 -level = INFO
1052 -handlers = stderr
1053 -qualname = cinder
1054 -
1055 -# Both of these are used for tracking what cinder and taskflow is doing with
1056 -# regard to flows and tasks (and the activity there-in).
1057 -[logger_cinder_flow_utils]
1058 -level = INFO
1059 -handlers = tasks,stderr
1060 -qualname = cinder.flow_utils
1061 -
1062 -[logger_taskflow]
1063 -level = INFO
1064 -handlers = tasks
1065 -qualname = taskflow
1066 -
1067 -[logger_amqplib]
1068 -level = WARNING
1069 -handlers = stderr
1070 -qualname = amqplib
1071 -
1072 -[logger_sqlalchemy]
1073 -level = WARNING
1074 -handlers = stderr
1075 -qualname = sqlalchemy
1076 -# "level = INFO" logs SQL queries.
1077 -# "level = DEBUG" logs SQL queries and results.
1078 -# "level = WARNING" logs neither. (Recommended for production systems.)
1079 -
1080 -[logger_boto]
1081 -level = WARNING
1082 -handlers = stderr
1083 -qualname = boto
1084 -
1085 -[logger_suds]
1086 -level = INFO
1087 -handlers = stderr
1088 -qualname = suds
1089 -
1090 -[logger_eventletwsgi]
1091 -level = WARNING
1092 -handlers = stderr
1093 -qualname = eventlet.wsgi.server
1094 -
1095 -[handler_stderr]
1096 -class = StreamHandler
1097 -args = (sys.stderr,)
1098 -formatter = context
1099 -
1100 -[handler_stdout]
1101 -class = StreamHandler
1102 -args = (sys.stdout,)
1103 -formatter = context
1104 -
1105 -[handler_watchedfile]
1106 -class = handlers.WatchedFileHandler
1107 -args = ('cinder.log',)
1108 -formatter = context
1109 -
1110 -[handler_tasks]
1111 -class = handlers.WatchedFileHandler
1112 -args = ('tasks.log',)
1113 -formatter = context
1114 -
1115 -[handler_syslog]
1116 -class = handlers.SysLogHandler
1117 -args = ('/dev/log', handlers.SysLogHandler.LOG_USER)
1118 -formatter = context
1119 -
1120 -[handler_null]
1121 -class = logging.NullHandler
1122 -formatter = default
1123 -args = ()
1124 -
1125 -[formatter_context]
1126 -class = oslo_log.formatters.ContextFormatter
1127 -
1128 -[formatter_default]
1129 -format = %(message)s
1130
1131 diff --git a/sys-cluster/cinder/files/etc.liberty/policy.json b/sys-cluster/cinder/files/etc.liberty/policy.json
1132 deleted file mode 100644
1133 index 4c8a8aa5079..00000000000
1134 --- a/sys-cluster/cinder/files/etc.liberty/policy.json
1135 +++ /dev/null
1136 @@ -1,99 +0,0 @@
1137 -{
1138 - "context_is_admin": "role:admin",
1139 - "admin_or_owner": "is_admin:True or project_id:%(project_id)s",
1140 - "default": "rule:admin_or_owner",
1141 -
1142 - "admin_api": "is_admin:True",
1143 -
1144 - "volume:create": "",
1145 - "volume:delete": "rule:admin_or_owner",
1146 - "volume:get": "rule:admin_or_owner",
1147 - "volume:get_all": "rule:admin_or_owner",
1148 - "volume:get_volume_metadata": "rule:admin_or_owner",
1149 - "volume:delete_volume_metadata": "rule:admin_or_owner",
1150 - "volume:update_volume_metadata": "rule:admin_or_owner",
1151 - "volume:get_volume_admin_metadata": "rule:admin_api",
1152 - "volume:update_volume_admin_metadata": "rule:admin_api",
1153 - "volume:get_snapshot": "rule:admin_or_owner",
1154 - "volume:get_all_snapshots": "rule:admin_or_owner",
1155 - "volume:delete_snapshot": "rule:admin_or_owner",
1156 - "volume:update_snapshot": "rule:admin_or_owner",
1157 - "volume:extend": "rule:admin_or_owner",
1158 - "volume:update_readonly_flag": "rule:admin_or_owner",
1159 - "volume:retype": "rule:admin_or_owner",
1160 - "volume:update": "rule:admin_or_owner",
1161 -
1162 - "volume_extension:types_manage": "rule:admin_api",
1163 - "volume_extension:types_extra_specs": "rule:admin_api",
1164 - "volume_extension:volume_type_access": "rule:admin_or_owner",
1165 - "volume_extension:volume_type_access:addProjectAccess": "rule:admin_api",
1166 - "volume_extension:volume_type_access:removeProjectAccess": "rule:admin_api",
1167 - "volume_extension:volume_type_encryption": "rule:admin_api",
1168 - "volume_extension:volume_encryption_metadata": "rule:admin_or_owner",
1169 - "volume_extension:extended_snapshot_attributes": "rule:admin_or_owner",
1170 - "volume_extension:volume_image_metadata": "rule:admin_or_owner",
1171 -
1172 - "volume_extension:quotas:show": "",
1173 - "volume_extension:quotas:update": "rule:admin_api",
1174 - "volume_extension:quota_classes": "rule:admin_api",
1175 -
1176 - "volume_extension:volume_admin_actions:reset_status": "rule:admin_api",
1177 - "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api",
1178 - "volume_extension:backup_admin_actions:reset_status": "rule:admin_api",
1179 - "volume_extension:volume_admin_actions:force_delete": "rule:admin_api",
1180 - "volume_extension:volume_admin_actions:force_detach": "rule:admin_api",
1181 - "volume_extension:snapshot_admin_actions:force_delete": "rule:admin_api",
1182 - "volume_extension:backup_admin_actions:force_delete": "rule:admin_api",
1183 - "volume_extension:volume_admin_actions:migrate_volume": "rule:admin_api",
1184 - "volume_extension:volume_admin_actions:migrate_volume_completion": "rule:admin_api",
1185 -
1186 - "volume_extension:volume_host_attribute": "rule:admin_api",
1187 - "volume_extension:volume_tenant_attribute": "rule:admin_or_owner",
1188 - "volume_extension:volume_mig_status_attribute": "rule:admin_api",
1189 - "volume_extension:hosts": "rule:admin_api",
1190 - "volume_extension:services:index": "rule:admin_api",
1191 - "volume_extension:services:update" : "rule:admin_api",
1192 -
1193 - "volume_extension:volume_manage": "rule:admin_api",
1194 - "volume_extension:volume_unmanage": "rule:admin_api",
1195 -
1196 - "volume_extension:capabilities": "rule:admin_api",
1197 -
1198 - "volume:create_transfer": "rule:admin_or_owner",
1199 - "volume:accept_transfer": "",
1200 - "volume:delete_transfer": "rule:admin_or_owner",
1201 - "volume:get_all_transfers": "rule:admin_or_owner",
1202 -
1203 - "volume_extension:replication:promote": "rule:admin_api",
1204 - "volume_extension:replication:reenable": "rule:admin_api",
1205 -
1206 - "volume:enable_replication": "rule:admin_api",
1207 - "volume:disable_replication": "rule:admin_api",
1208 - "volume:failover_replication": "rule:admin_api",
1209 - "volume:list_replication_targets": "rule:admin_api",
1210 -
1211 - "backup:create" : "",
1212 - "backup:delete": "rule:admin_or_owner",
1213 - "backup:get": "rule:admin_or_owner",
1214 - "backup:get_all": "rule:admin_or_owner",
1215 - "backup:restore": "rule:admin_or_owner",
1216 - "backup:backup-import": "rule:admin_api",
1217 - "backup:backup-export": "rule:admin_api",
1218 -
1219 - "snapshot_extension:snapshot_actions:update_snapshot_status": "",
1220 - "snapshot_extension:snapshot_manage": "rule:admin_api",
1221 - "snapshot_extension:snapshot_unmanage": "rule:admin_api",
1222 -
1223 - "consistencygroup:create" : "group:nobody",
1224 - "consistencygroup:delete": "group:nobody",
1225 - "consistencygroup:update": "group:nobody",
1226 - "consistencygroup:get": "group:nobody",
1227 - "consistencygroup:get_all": "group:nobody",
1228 -
1229 - "consistencygroup:create_cgsnapshot" : "group:nobody",
1230 - "consistencygroup:delete_cgsnapshot": "group:nobody",
1231 - "consistencygroup:get_cgsnapshot": "group:nobody",
1232 - "consistencygroup:get_all_cgsnapshots": "group:nobody",
1233 -
1234 - "scheduler_extension:scheduler_stats:get_pools" : "rule:admin_api"
1235 -}
1236
1237 diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.conf b/sys-cluster/cinder/files/etc.liberty/rootwrap.conf
1238 deleted file mode 100644
1239 index 4d280eae5c8..00000000000
1240 --- a/sys-cluster/cinder/files/etc.liberty/rootwrap.conf
1241 +++ /dev/null
1242 @@ -1,27 +0,0 @@
1243 -# Configuration for cinder-rootwrap
1244 -# This file should be owned by (and only-writeable by) the root user
1245 -
1246 -[DEFAULT]
1247 -# List of directories to load filter definitions from (separated by ',').
1248 -# These directories MUST all be only writeable by root !
1249 -filters_path=/etc/cinder/rootwrap.d,/usr/share/cinder/rootwrap
1250 -
1251 -# List of directories to search executables in, in case filters do not
1252 -# explicitely specify a full path (separated by ',')
1253 -# If not specified, defaults to system PATH environment variable.
1254 -# These directories MUST all be only writeable by root !
1255 -exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin
1256 -
1257 -# Enable logging to syslog
1258 -# Default value is False
1259 -use_syslog=False
1260 -
1261 -# Which syslog facility to use.
1262 -# Valid values include auth, authpriv, syslog, local0, local1...
1263 -# Default value is 'syslog'
1264 -syslog_log_facility=syslog
1265 -
1266 -# Which messages to log.
1267 -# INFO means log all usage
1268 -# ERROR means only log unsuccessful attempts
1269 -syslog_log_level=ERROR
1270
1271 diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters b/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters
1272 deleted file mode 100644
1273 index 9e7ab384c4f..00000000000
1274 --- a/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters
1275 +++ /dev/null
1276 @@ -1,207 +0,0 @@
1277 -# cinder-rootwrap command filters for volume nodes
1278 -# This file should be owned by (and only-writeable by) the root user
1279 -
1280 -[Filters]
1281 -# cinder/volume/iscsi.py: iscsi_helper '--op' ...
1282 -ietadm: CommandFilter, ietadm, root
1283 -tgtadm: CommandFilter, tgtadm, root
1284 -iscsictl: CommandFilter, iscsictl, root
1285 -tgt-admin: CommandFilter, tgt-admin, root
1286 -cinder-rtstool: CommandFilter, cinder-rtstool, root
1287 -scstadmin: CommandFilter, scstadmin, root
1288 -
1289 -# LVM related show commands
1290 -pvs: EnvFilter, env, root, LC_ALL=C, pvs
1291 -vgs: EnvFilter, env, root, LC_ALL=C, vgs
1292 -lvs: EnvFilter, env, root, LC_ALL=C, lvs
1293 -lvdisplay: EnvFilter, env, root, LC_ALL=C, lvdisplay
1294 -
1295 -# LVM conf var
1296 -pvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, pvs
1297 -vgs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, vgs
1298 -lvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvs
1299 -lvdisplay_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvdisplay
1300 -
1301 -# os-brick library commands
1302 -# TODO(smcginnis) This is a temporary fix. Need to pull in os-brick
1303 -# os-brick.filters file instead and clean out stale brick values from
1304 -# this file.
1305 -scsi_id: CommandFilter, /lib/udev/scsi_id, root
1306 -
1307 -# cinder/volumes/drivers/srb.py: 'pvresize', '--setphysicalvolumesize', sizestr, pvname
1308 -pvresize: CommandFilter, pvresize, root
1309 -
1310 -# cinder/brick/local_dev/lvm.py: 'vgcreate', vg_name, pv_list
1311 -vgcreate: CommandFilter, vgcreate, root
1312 -
1313 -# cinder/volumes/drivers/srb.py: 'vgremove', '-f', vgname
1314 -vgremove: CommandFilter, vgremove, root
1315 -
1316 -# cinder/volumes/drivers/srb.py: 'vgchange', '-an', vgname
1317 -# cinder/volumes/drivers/srb.py: 'vgchange', '-ay', vgname
1318 -vgchange: CommandFilter, vgchange, root
1319 -
1320 -# cinder/volume/driver.py: 'lvcreate', '-L', sizestr, '-n', volume_name,..
1321 -# cinder/volume/driver.py: 'lvcreate', '-L', ...
1322 -lvcreate: CommandFilter, lvcreate, root
1323 -
1324 -# cinder/volume/driver.py: 'dd', 'if=%s' % srcstr, 'of=%s' % deststr,...
1325 -dd: CommandFilter, dd, root
1326 -
1327 -# cinder/volume/driver.py: 'lvremove', '-f', %s/%s % ...
1328 -lvremove: CommandFilter, lvremove, root
1329 -
1330 -# cinder/volume/driver.py: 'lvrename', '%(vg)s', '%(orig)s' '(new)s'...
1331 -lvrename: CommandFilter, lvrename, root
1332 -
1333 -# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(lv_name)s' ...
1334 -# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(thin_pool)s' ...
1335 -lvextend: CommandFilter, lvextend, root
1336 -
1337 -# cinder/brick/local_dev/lvm.py: 'lvchange -a y -K <lv>'
1338 -lvchange: CommandFilter, lvchange, root
1339 -
1340 -# cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',...
1341 -# cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ...
1342 -iscsiadm: CommandFilter, iscsiadm, root
1343 -
1344 -# cinder/volume/drivers/lvm.py: 'shred', '-n3'
1345 -# cinder/volume/drivers/lvm.py: 'shred', '-n0', '-z', '-s%dMiB'
1346 -shred: CommandFilter, shred, root
1347 -
1348 -# cinder/volume/utils.py: utils.temporary_chown(path, 0)
1349 -chown: CommandFilter, chown, root
1350 -
1351 -# cinder/volume/utils.py: copy_volume(..., ionice='...')
1352 -ionice_1: ChainingRegExpFilter, ionice, root, ionice, -c[0-3], -n[0-7]
1353 -ionice_2: ChainingRegExpFilter, ionice, root, ionice, -c[0-3]
1354 -
1355 -# cinder/volume/utils.py: setup_blkio_cgroup()
1356 -cgcreate: CommandFilter, cgcreate, root
1357 -cgset: CommandFilter, cgset, root
1358 -cgexec: ChainingRegExpFilter, cgexec, root, cgexec, -g, blkio:\S+
1359 -
1360 -# cinder/volume/driver.py
1361 -dmsetup: CommandFilter, dmsetup, root
1362 -ln: CommandFilter, ln, root
1363 -
1364 -# cinder/image/image_utils.py
1365 -qemu-img: EnvFilter, env, root, LC_ALL=C, qemu-img
1366 -qemu-img_convert: CommandFilter, qemu-img, root
1367 -
1368 -udevadm: CommandFilter, udevadm, root
1369 -
1370 -# cinder/volume/driver.py: utils.read_file_as_root()
1371 -cat: CommandFilter, cat, root
1372 -
1373 -# cinder/volume/nfs.py
1374 -stat: CommandFilter, stat, root
1375 -mount: CommandFilter, mount, root
1376 -df: CommandFilter, df, root
1377 -du: CommandFilter, du, root
1378 -truncate: CommandFilter, truncate, root
1379 -chmod: CommandFilter, chmod, root
1380 -rm: CommandFilter, rm, root
1381 -
1382 -# cinder/volume/drivers/netapp/nfs.py:
1383 -netapp_nfs_find: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -name, img-cache.*, -amin, \+\d+
1384 -
1385 -# cinder/volume/drivers/glusterfs.py
1386 -chgrp: CommandFilter, chgrp, root
1387 -umount: CommandFilter, umount, root
1388 -fallocate: CommandFilter, fallocate, root
1389 -
1390 -# cinder/volumes/drivers/hds/hds.py:
1391 -hus-cmd: CommandFilter, hus-cmd, root
1392 -hus-cmd_local: CommandFilter, /usr/local/bin/hus-cmd, root
1393 -
1394 -# cinder/volumes/drivers/hds/hnas_backend.py
1395 -ssc: CommandFilter, ssc, root
1396 -
1397 -# cinder/brick/initiator/connector.py:
1398 -ls: CommandFilter, ls, root
1399 -tee: CommandFilter, tee, root
1400 -multipath: CommandFilter, multipath, root
1401 -multipathd: CommandFilter, multipathd, root
1402 -systool: CommandFilter, systool, root
1403 -
1404 -# cinder/volume/drivers/block_device.py
1405 -blockdev: CommandFilter, blockdev, root
1406 -
1407 -# cinder/volume/drivers/ibm/gpfs.py
1408 -# cinder/volume/drivers/tintri.py
1409 -mv: CommandFilter, mv, root
1410 -
1411 -# cinder/volume/drivers/ibm/gpfs.py
1412 -cp: CommandFilter, cp, root
1413 -mmgetstate: CommandFilter, /usr/lpp/mmfs/bin/mmgetstate, root
1414 -mmclone: CommandFilter, /usr/lpp/mmfs/bin/mmclone, root
1415 -mmlsattr: CommandFilter, /usr/lpp/mmfs/bin/mmlsattr, root
1416 -mmchattr: CommandFilter, /usr/lpp/mmfs/bin/mmchattr, root
1417 -mmlsconfig: CommandFilter, /usr/lpp/mmfs/bin/mmlsconfig, root
1418 -mmlsfs: CommandFilter, /usr/lpp/mmfs/bin/mmlsfs, root
1419 -mmlspool: CommandFilter, /usr/lpp/mmfs/bin/mmlspool, root
1420 -mkfs: CommandFilter, mkfs, root
1421 -mmcrfileset: CommandFilter, /usr/lpp/mmfs/bin/mmcrfileset, root
1422 -mmlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmlinkfileset, root
1423 -mmunlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmunlinkfileset, root
1424 -mmdelfileset: CommandFilter, /usr/lpp/mmfs/bin/mmdelfileset, root
1425 -mmcrsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmcrsnapshot, root
1426 -mmdelsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmdelsnapshot, root
1427 -
1428 -# cinder/volume/drivers/ibm/gpfs.py
1429 -# cinder/volume/drivers/ibm/ibmnas.py
1430 -find_maxdepth_inum: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -inum, \d+
1431 -
1432 -# cinder/brick/initiator/connector.py:
1433 -aoe-revalidate: CommandFilter, aoe-revalidate, root
1434 -aoe-discover: CommandFilter, aoe-discover, root
1435 -aoe-flush: CommandFilter, aoe-flush, root
1436 -
1437 -# cinder/brick/initiator/linuxscsi.py:
1438 -sg_scan: CommandFilter, sg_scan, root
1439 -
1440 -#cinder/backup/services/tsm.py
1441 -dsmc:CommandFilter,/usr/bin/dsmc,root
1442 -
1443 -# cinder/volume/drivers/hitachi/hbsd_horcm.py
1444 -raidqry: CommandFilter, raidqry, root
1445 -raidcom: CommandFilter, raidcom, root
1446 -pairsplit: CommandFilter, pairsplit, root
1447 -paircreate: CommandFilter, paircreate, root
1448 -pairdisplay: CommandFilter, pairdisplay, root
1449 -pairevtwait: CommandFilter, pairevtwait, root
1450 -horcmstart.sh: CommandFilter, horcmstart.sh, root
1451 -horcmshutdown.sh: CommandFilter, horcmshutdown.sh, root
1452 -horcmgr: EnvFilter, env, root, HORCMINST=, /etc/horcmgr
1453 -
1454 -# cinder/volume/drivers/hitachi/hbsd_snm2.py
1455 -auman: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auman
1456 -auluref: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluref
1457 -auhgdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgdef
1458 -aufibre1: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aufibre1
1459 -auhgwwn: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgwwn
1460 -auhgmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgmap
1461 -autargetmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetmap
1462 -aureplicationvvol: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationvvol
1463 -auluadd: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluadd
1464 -auludel: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auludel
1465 -auluchgsize: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluchgsize
1466 -auchapuser: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auchapuser
1467 -autargetdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetdef
1468 -autargetopt: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetopt
1469 -autargetini: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetini
1470 -auiscsi: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auiscsi
1471 -audppool: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/audppool
1472 -aureplicationlocal: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationlocal
1473 -aureplicationmon: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationmon
1474 -
1475 -# cinder/volume/drivers/hgst.py
1476 -vgc-cluster: CommandFilter, vgc-cluster, root
1477 -
1478 -# cinder/volume/drivers/vzstorage.py
1479 -pstorage-mount: CommandFilter, pstorage-mount, root
1480 -pstorage: CommandFilter, pstorage, root
1481 -
1482 -# initiator/connector.py:
1483 -drv_cfg: CommandFilter, /opt/emc/scaleio/sdc/bin/drv_cfg, root, /opt/emc/scaleio/sdc/bin/drv_cfg, --query_guid