sys-cluster/cinder: remove ocata

Package-Manager: Portage-2.3.19, Repoman-2.3.6

15 files changed, 8 insertions, 1317 deletions

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 51ab6a5f0fa8..e462e21ce38a 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,10 +1,2 @@
-DIST cinder-10.0.6.tar.gz 4624145 BLAKE2B c3e12c4f49b9b06b674d12354e867328eaaef565930ac1d3078c4611f14f61463d458a2bfd679a0a6cb8ce5b677b037618a800d229bf352797b20b57c8383e6b SHA512 28c84260909d0c1a9b0cd6a7409dad3e09d0d7bd662b8ca61c6c3ca04fb797723bc0f4df7db3a6951d1ce354a84b907bf1832190c02a5992c8ac70cf95fb00b9
 DIST cinder-11.0.2.tar.gz 5794973 BLAKE2B a7b59afbe3e27a2fde28a3dcb2ba3707c67223ae7e98cb34d0ac92beb16ab8f10c07f22fda091c9db9a02fd2eff4769a6e574a94cb19df1e9506c36321a12014 SHA512 6340150aa010a4372a7e51dc976974839f89b180eef61c9307c5b477dae98c8629a3f54cbc3d114dca28ca75c715930357cfc96d08f80acaabacee8f8c0bf3a6
-DIST cinder-9.1.4.tar.gz 4195597 BLAKE2B a35b3c588d0589baf2887ebe6c9c6c4803a6819476c822fa3d314b8cb74f4fabae19cf224a3b9dc2c6255338eff6413be189e3555f5e49578451604f091169ba SHA512 8039d5208296ea54fc869fb05dd91451ac3575eb3dd2ed97d0c63120d18b67b02b835a849cd1ec3dae349920895e13665c15a6daa53f67138823053c49ab87a9
-DIST newton-cinder-policy.json 6412 BLAKE2B 90c6a2733b0c20a95375e9a588c311e48f9f189aff43ce9a89a808e6693b2f14ca0485fbea4d000674414081171989dc8050c0079e4e137f728decbdf8a5cec0 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56
-DIST newton-cinder-volume.filters 11025 BLAKE2B ac87bb2aaab3bd492ea2f7ce7526e7ff444778ce516c71bce769f2cff1badebe7cbf520c604a0193b03f615e0d34dff21cee34f4798cc03151711b205924728b SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d
-DIST newton-cinder.conf.sample 50793 BLAKE2B 4537ae2f7dc70fd6711a0a07a301b036af8eab72372317a96355956fa05f67562374a5ad45b60d84d569f5c52a3d36b34fde4d2defcde4d11e69c99a64e22997 SHA512 bf3b5fa262d7df57ca8a496724df449eb6c49ea951c1384b216af334db7cb948af5f7a5f24ddcebd4c80cca40da65e8aaa3a65f09ae2e184794ec1bf9bf466db
-DIST ocata-cinder-policy.json 6614 BLAKE2B 7b47da231386543e6fa438796a747882daa8b39453b6940c9ce454e3989ccc76cec9aebdc96b0820786cad978c6ed834bca6e25f812c8e07028edf100dfba299 SHA512 6a3da28674e7bf828a2be8de0b41e6abe59567d0abf2a41781580ba611ca888e072960f3e702e834a1599e6bbb49beb1cd37f7a32e35afaf8dfc73f2852e2302
-DIST ocata-cinder-volume.filters 11067 BLAKE2B 84e642296960124126155ab725cbbb1754d8303bcb97d85117123671fbf2e96e84c1b38f74d88f6adda9a7f89a784669f45dcb9fadabdace30fc4f53c89d34e5 SHA512 9600ca77a63db04844ab9d658ffd0d97abe1c669d91f69d126b364b2700d749cd45d7df1e31ffd7e80698157e9267c3138cae098f36d77995bab73afdf32ff9f
-DIST ocata-cinder.conf.sample 173024 BLAKE2B 11c53b4507d8ad53cfb49fa4c79760f2d3d8bf65f142a4bdec6731e732e5503a217ae5ab1c7220f73fea4ff2d91b5a84b6230484df672b5022c66d7f4f3eefa0 SHA512 bbecf45ad20b3193023a137b5c3237dfc15bd6a232dda5de631096bf55916eb0fffba7506eeffdc1a3c848ac042cb286dea44387ff0eef84ec7bbcaffb4aa58e
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
diff --git a/sys-cluster/cinder/cinder-10.0.6.ebuild b/sys-cluster/cinder/cinder-10.0.6.ebuild
deleted file mode 100644
index 50016f1ae5d7..000000000000
--- a/sys-cluster/cinder/cinder-10.0.6.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-11.0.2.ebuild b/sys-cluster/cinder/cinder-11.0.2.ebuild
index ed819298e2b2..b0f15626d2d7 100644
--- a/sys-cluster/cinder/cinder-11.0.2.ebuild
+++ b/sys-cluster/cinder/cinder-11.0.2.ebuild
@@ -177,7 +177,7 @@ python_install_all() {
 	dodir /etc/cinder/rootwrap.d
 
 	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc}
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
 	done
 
 	insinto /etc/cinder
diff --git a/sys-cluster/cinder/cinder-2016.2.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
deleted file mode 100644
index b0cc1c89ab48..000000000000
--- a/sys-cluster/cinder/cinder-2016.2.9999.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils git-r3 linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters"
-EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-EGIT_BRANCH="stable/newton"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	newins "${DISTDIR}/newton-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-2017.1.9999.ebuild b/sys-cluster/cinder/cinder-2017.1.9999.ebuild
deleted file mode 100644
index f7d1edd70082..000000000000
--- a/sys-cluster/cinder/cinder-2017.1.9999.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils git-r3 linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/cinder.conf.sample -> ocata-cinder.conf.sample
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/policy.json -> ocata-cinder-policy.json
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/ocata/volume.filters -> ocata-cinder-volume.filters"
-EGIT_REPO_URI="https://github.com/openstack/cinder.git"
-EGIT_BRANCH="stable/ocata"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.18.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.15.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	!~dev-python/requests-2.12.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.17.1[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	newins "${DISTDIR}/ocata-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/ocata-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	newins "${DISTDIR}/ocata-cinder-volume.filters" "volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-2017.2.9999.ebuild b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
index 9db27e401adc..2f6ae69b2644 100644
--- a/sys-cluster/cinder/cinder-2017.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2017.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -178,7 +178,7 @@ python_install_all() {
 	dodir /etc/cinder/rootwrap.d
 
 	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd-2" cinder-${svc}
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
 	done
 
 	insinto /etc/cinder
diff --git a/sys-cluster/cinder/cinder-9.1.4.ebuild b/sys-cluster/cinder/cinder-9.1.4.ebuild
deleted file mode 100644
index a4f99f386431..000000000000
--- a/sys-cluster/cinder/cinder-9.1.4.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json
-https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
-	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
-	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
-	!~dev-python/routes-2.1[$(python_gen_usedep 'python2_7')]
-	!~dev-python/routes-2.3[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.28.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	newins "${DISTDIR}/newton-cinder-policy.json" "policy.json"
-	newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/files/cinder.initd b/sys-cluster/cinder/files/cinder.initd
index 0c86345a8a1e..b6a844a93c77 100644
--- a/sys-cluster/cinder/files/cinder.initd
+++ b/sys-cluster/cinder/files/cinder.initd
@@ -1,23 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Starts ${SVCNAME} service for OpenStack"
 
 command=/usr/bin/${SVCNAME}
 command_background=yes
-command_args="--config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/${SVCNAME}.log"
-pidfile=/var/run/cinder/${SVCNAME}.pid
+command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log"
+command_user="${CINDER_USER:-cinder}"
+pidfile=/run/${SVCNAME}.pid
 required_files=/etc/cinder/cinder.conf
-
-start_stop_daemon_args="--quiet --user ${CINDER_USER:-cinder}"
+retry="SIGTERM/30"
 
 depend() {
 	need net
 }
-
-start_pre() {
-	checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_RUN:-/var/run/cinder}
-  checkpath --directory --owner ${CINDER_USER:-cinder}:${CINDER_GROUP:-cinder} --mode 0755 ${CINDER_LOCK:-/var/lock/cinder}
-}
-
diff --git a/sys-cluster/cinder/files/cinder.initd-2 b/sys-cluster/cinder/files/cinder.initd-2
deleted file mode 100644
index 31584dee9d23..000000000000
--- a/sys-cluster/cinder/files/cinder.initd-2
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Starts ${SVCNAME} service for OpenStack"
-
-command=/usr/bin/${SVCNAME}
-command_background=yes
-command_args="--config-file /etc/cinder/cinder.conf --log-file ${CINDER_LOGDIR:-/var/log/cinder}/${SVCNAME}.log"
-command_user="${CINDER_USER:-cinder}"
-pidfile=/run/${SVCNAME}.pid
-required_files=/etc/cinder/cinder.conf
-retry="SIGTERM/30"
-
-depend() {
-	need net
-}
diff --git a/sys-cluster/cinder/files/etc.liberty/api-httpd.conf b/sys-cluster/cinder/files/etc.liberty/api-httpd.conf
deleted file mode 100644
index f3555477acc7..000000000000
--- a/sys-cluster/cinder/files/etc.liberty/api-httpd.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-Listen 8776
-LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-agent}i\" %D(us)" cinder_combined
-
-<VirtualHost *:8776>
-    WSGIDaemonProcess osapi_volume processes=2 threads=1 user=cinder display-name=%{GROUP}
-    WSGIProcessGroup osapi_volume
-    WSGIScriptAlias / /var/www/cgi-bin/cinder/osapi_volume
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIPassAuthorization On
-    <IfVersion >= 2.4>
-      ErrorLogFormat "%{cu}t %M"
-    </IfVersion>
-    ErrorLog /var/log/apache2/cinder_error.log
-    CustomLog /var/log/apache2/cinder.log cinder_combined
-
-</VirtualHost>
diff --git a/sys-cluster/cinder/files/etc.liberty/api-paste.ini b/sys-cluster/cinder/files/etc.liberty/api-paste.ini
deleted file mode 100644
index b2822b044db0..000000000000
--- a/sys-cluster/cinder/files/etc.liberty/api-paste.ini
+++ /dev/null
@@ -1,60 +0,0 @@
-#############
-# OpenStack #
-#############
-
-[composite:osapi_volume]
-use = call:cinder.api:root_app_factory
-/: apiversions
-/v1: openstack_volume_api_v1
-/v2: openstack_volume_api_v2
-
-[composite:openstack_volume_api_v1]
-use = call:cinder.api.middleware.auth:pipeline_factory
-noauth = request_id faultwrap sizelimit osprofiler noauth apiv1
-keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
-keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv1
-
-[composite:openstack_volume_api_v2]
-use = call:cinder.api.middleware.auth:pipeline_factory
-noauth = request_id faultwrap sizelimit osprofiler noauth apiv2
-keystone = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
-keystone_nolimit = request_id faultwrap sizelimit osprofiler authtoken keystonecontext apiv2
-
-[filter:request_id]
-paste.filter_factory = oslo_middleware.request_id:RequestId.factory
-
-[filter:faultwrap]
-paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
-
-[filter:osprofiler]
-paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
-hmac_keys = SECRET_KEY
-enabled = yes
-
-[filter:noauth]
-paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
-
-[filter:sizelimit]
-paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory
-
-[app:apiv1]
-paste.app_factory = cinder.api.v1.router:APIRouter.factory
-
-[app:apiv2]
-paste.app_factory = cinder.api.v2.router:APIRouter.factory
-
-[pipeline:apiversions]
-pipeline = faultwrap osvolumeversionapp
-
-[app:osvolumeversionapp]
-paste.app_factory = cinder.api.versions:Versions.factory
-
-##########
-# Shared #
-##########
-
-[filter:keystonecontext]
-paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
-
-[filter:authtoken]
-paste.filter_factory = keystonemiddleware.auth_token:filter_factory
diff --git a/sys-cluster/cinder/files/etc.liberty/logging_sample.conf b/sys-cluster/cinder/files/etc.liberty/logging_sample.conf
deleted file mode 100644
index f9a8deb1b3c1..000000000000
--- a/sys-cluster/cinder/files/etc.liberty/logging_sample.conf
+++ /dev/null
@@ -1,93 +0,0 @@
-[loggers]
-keys = root, cinder, taskflow, cinder_flow_utils
-
-[handlers]
-keys = stderr, stdout, watchedfile, syslog, tasks, null
-
-[formatters]
-keys = context, default
-
-[logger_root]
-level = WARNING
-handlers = null
-
-[logger_cinder]
-level = INFO
-handlers = stderr
-qualname = cinder
-
-# Both of these are used for tracking what cinder and taskflow is doing with
-# regard to flows and tasks (and the activity there-in).
-[logger_cinder_flow_utils]
-level = INFO
-handlers = tasks,stderr
-qualname = cinder.flow_utils
-
-[logger_taskflow]
-level = INFO
-handlers = tasks
-qualname = taskflow
-
-[logger_amqplib]
-level = WARNING
-handlers = stderr
-qualname = amqplib
-
-[logger_sqlalchemy]
-level = WARNING
-handlers = stderr
-qualname = sqlalchemy
-# "level = INFO" logs SQL queries.
-# "level = DEBUG" logs SQL queries and results.
-# "level = WARNING" logs neither.  (Recommended for production systems.)
-
-[logger_boto]
-level = WARNING
-handlers = stderr
-qualname = boto
-
-[logger_suds]
-level = INFO
-handlers = stderr
-qualname = suds
-
-[logger_eventletwsgi]
-level = WARNING
-handlers = stderr
-qualname = eventlet.wsgi.server
-
-[handler_stderr]
-class = StreamHandler
-args = (sys.stderr,)
-formatter = context
-
-[handler_stdout]
-class = StreamHandler
-args = (sys.stdout,)
-formatter = context
-
-[handler_watchedfile]
-class = handlers.WatchedFileHandler
-args = ('cinder.log',)
-formatter = context
-
-[handler_tasks]
-class = handlers.WatchedFileHandler
-args = ('tasks.log',)
-formatter = context
-
-[handler_syslog]
-class = handlers.SysLogHandler
-args = ('/dev/log', handlers.SysLogHandler.LOG_USER)
-formatter = context
-
-[handler_null]
-class = logging.NullHandler
-formatter = default
-args = ()
-
-[formatter_context]
-class = oslo_log.formatters.ContextFormatter
-
-[formatter_default]
-format = %(message)s
diff --git a/sys-cluster/cinder/files/etc.liberty/policy.json b/sys-cluster/cinder/files/etc.liberty/policy.json
deleted file mode 100644
index 4c8a8aa5079c..000000000000
--- a/sys-cluster/cinder/files/etc.liberty/policy.json
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "context_is_admin": "role:admin",
-    "admin_or_owner":  "is_admin:True or project_id:%(project_id)s",
-    "default": "rule:admin_or_owner",
-
-    "admin_api": "is_admin:True",
-
-    "volume:create": "",
-    "volume:delete": "rule:admin_or_owner",
-    "volume:get": "rule:admin_or_owner",
-    "volume:get_all": "rule:admin_or_owner",
-    "volume:get_volume_metadata": "rule:admin_or_owner",
-    "volume:delete_volume_metadata": "rule:admin_or_owner",
-    "volume:update_volume_metadata": "rule:admin_or_owner",
-    "volume:get_volume_admin_metadata": "rule:admin_api",
-    "volume:update_volume_admin_metadata": "rule:admin_api",
-    "volume:get_snapshot": "rule:admin_or_owner",
-    "volume:get_all_snapshots": "rule:admin_or_owner",
-    "volume:delete_snapshot": "rule:admin_or_owner",
-    "volume:update_snapshot": "rule:admin_or_owner",
-    "volume:extend": "rule:admin_or_owner",
-    "volume:update_readonly_flag": "rule:admin_or_owner",
-    "volume:retype": "rule:admin_or_owner",
-    "volume:update": "rule:admin_or_owner",
-
-    "volume_extension:types_manage": "rule:admin_api",
-    "volume_extension:types_extra_specs": "rule:admin_api",
-    "volume_extension:volume_type_access": "rule:admin_or_owner",
-    "volume_extension:volume_type_access:addProjectAccess": "rule:admin_api",
-    "volume_extension:volume_type_access:removeProjectAccess": "rule:admin_api",
-    "volume_extension:volume_type_encryption": "rule:admin_api",
-    "volume_extension:volume_encryption_metadata": "rule:admin_or_owner",
-    "volume_extension:extended_snapshot_attributes": "rule:admin_or_owner",
-    "volume_extension:volume_image_metadata": "rule:admin_or_owner",
-
-    "volume_extension:quotas:show": "",
-    "volume_extension:quotas:update": "rule:admin_api",
-    "volume_extension:quota_classes": "rule:admin_api",
-
-    "volume_extension:volume_admin_actions:reset_status": "rule:admin_api",
-    "volume_extension:snapshot_admin_actions:reset_status": "rule:admin_api",
-    "volume_extension:backup_admin_actions:reset_status": "rule:admin_api",
-    "volume_extension:volume_admin_actions:force_delete": "rule:admin_api",
-    "volume_extension:volume_admin_actions:force_detach": "rule:admin_api",
-    "volume_extension:snapshot_admin_actions:force_delete": "rule:admin_api",
-    "volume_extension:backup_admin_actions:force_delete": "rule:admin_api",
-    "volume_extension:volume_admin_actions:migrate_volume": "rule:admin_api",
-    "volume_extension:volume_admin_actions:migrate_volume_completion": "rule:admin_api",
-
-    "volume_extension:volume_host_attribute": "rule:admin_api",
-    "volume_extension:volume_tenant_attribute": "rule:admin_or_owner",
-    "volume_extension:volume_mig_status_attribute": "rule:admin_api",
-    "volume_extension:hosts": "rule:admin_api",
-    "volume_extension:services:index": "rule:admin_api",
-    "volume_extension:services:update" : "rule:admin_api",
-
-    "volume_extension:volume_manage": "rule:admin_api",
-    "volume_extension:volume_unmanage": "rule:admin_api",
-
-    "volume_extension:capabilities": "rule:admin_api",
-
-    "volume:create_transfer": "rule:admin_or_owner",
-    "volume:accept_transfer": "",
-    "volume:delete_transfer": "rule:admin_or_owner",
-    "volume:get_all_transfers": "rule:admin_or_owner",
-
-    "volume_extension:replication:promote": "rule:admin_api",
-    "volume_extension:replication:reenable": "rule:admin_api",
-
-    "volume:enable_replication": "rule:admin_api",
-    "volume:disable_replication": "rule:admin_api",
-    "volume:failover_replication": "rule:admin_api",
-    "volume:list_replication_targets": "rule:admin_api",
-
-    "backup:create" : "",
-    "backup:delete": "rule:admin_or_owner",
-    "backup:get": "rule:admin_or_owner",
-    "backup:get_all": "rule:admin_or_owner",
-    "backup:restore": "rule:admin_or_owner",
-    "backup:backup-import": "rule:admin_api",
-    "backup:backup-export": "rule:admin_api",
-
-    "snapshot_extension:snapshot_actions:update_snapshot_status": "",
-    "snapshot_extension:snapshot_manage": "rule:admin_api",
-    "snapshot_extension:snapshot_unmanage": "rule:admin_api",
-
-    "consistencygroup:create" : "group:nobody",
-    "consistencygroup:delete": "group:nobody",
-    "consistencygroup:update": "group:nobody",
-    "consistencygroup:get": "group:nobody",
-    "consistencygroup:get_all": "group:nobody",
-
-    "consistencygroup:create_cgsnapshot" : "group:nobody",
-    "consistencygroup:delete_cgsnapshot": "group:nobody",
-    "consistencygroup:get_cgsnapshot": "group:nobody",
-    "consistencygroup:get_all_cgsnapshots": "group:nobody",
-
-    "scheduler_extension:scheduler_stats:get_pools" : "rule:admin_api"
-}
diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.conf b/sys-cluster/cinder/files/etc.liberty/rootwrap.conf
deleted file mode 100644
index 4d280eae5c82..000000000000
--- a/sys-cluster/cinder/files/etc.liberty/rootwrap.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for cinder-rootwrap
-# This file should be owned by (and only-writeable by) the root user
-
-[DEFAULT]
-# List of directories to load filter definitions from (separated by ',').
-# These directories MUST all be only writeable by root !
-filters_path=/etc/cinder/rootwrap.d,/usr/share/cinder/rootwrap
-
-# List of directories to search executables in, in case filters do not
-# explicitely specify a full path (separated by ',')
-# If not specified, defaults to system PATH environment variable.
-# These directories MUST all be only writeable by root !
-exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin
-
-# Enable logging to syslog
-# Default value is False
-use_syslog=False
-
-# Which syslog facility to use.
-# Valid values include auth, authpriv, syslog, local0, local1...
-# Default value is 'syslog'
-syslog_log_facility=syslog
-
-# Which messages to log.
-# INFO means log all usage
-# ERROR means only log unsuccessful attempts
-syslog_log_level=ERROR
diff --git a/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters b/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters
deleted file mode 100644
index 9e7ab384c4f7..000000000000
--- a/sys-cluster/cinder/files/etc.liberty/rootwrap.d/volume.filters
+++ /dev/null
@@ -1,207 +0,0 @@
-# cinder-rootwrap command filters for volume nodes
-# This file should be owned by (and only-writeable by) the root user
-
-[Filters]
-# cinder/volume/iscsi.py: iscsi_helper '--op' ...
-ietadm: CommandFilter, ietadm, root
-tgtadm: CommandFilter, tgtadm, root
-iscsictl: CommandFilter, iscsictl, root
-tgt-admin: CommandFilter, tgt-admin, root
-cinder-rtstool: CommandFilter, cinder-rtstool, root
-scstadmin: CommandFilter, scstadmin, root
-
-# LVM related show commands
-pvs: EnvFilter, env, root, LC_ALL=C, pvs
-vgs: EnvFilter, env, root, LC_ALL=C, vgs
-lvs: EnvFilter, env, root, LC_ALL=C, lvs
-lvdisplay: EnvFilter, env, root, LC_ALL=C, lvdisplay
-
-# LVM conf var
-pvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, pvs
-vgs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, vgs
-lvs_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvs
-lvdisplay_lvmconf: EnvFilter, env, root, LVM_SYSTEM_DIR=, LC_ALL=C, lvdisplay
-
-# os-brick library commands
-# TODO(smcginnis) This is a temporary fix. Need to pull in os-brick
-# os-brick.filters file instead and clean out stale brick values from
-# this file.
-scsi_id: CommandFilter, /lib/udev/scsi_id, root
-
-# cinder/volumes/drivers/srb.py: 'pvresize', '--setphysicalvolumesize', sizestr, pvname
-pvresize: CommandFilter, pvresize, root
-
-# cinder/brick/local_dev/lvm.py: 'vgcreate', vg_name, pv_list
-vgcreate: CommandFilter, vgcreate, root
-
-# cinder/volumes/drivers/srb.py: 'vgremove', '-f', vgname
-vgremove: CommandFilter, vgremove, root
-
-# cinder/volumes/drivers/srb.py: 'vgchange', '-an', vgname
-# cinder/volumes/drivers/srb.py: 'vgchange', '-ay', vgname
-vgchange: CommandFilter, vgchange, root
-
-# cinder/volume/driver.py: 'lvcreate', '-L', sizestr, '-n', volume_name,..
-# cinder/volume/driver.py: 'lvcreate', '-L', ...
-lvcreate: CommandFilter, lvcreate, root
-
-# cinder/volume/driver.py: 'dd', 'if=%s' % srcstr, 'of=%s' % deststr,...
-dd: CommandFilter, dd, root
-
-# cinder/volume/driver.py: 'lvremove', '-f', %s/%s % ...
-lvremove: CommandFilter, lvremove, root
-
-# cinder/volume/driver.py: 'lvrename', '%(vg)s', '%(orig)s' '(new)s'...
-lvrename: CommandFilter, lvrename, root
-
-# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(lv_name)s' ...
-# cinder/volume/driver.py: 'lvextend', '-L' '%(new_size)s', '%(thin_pool)s' ...
-lvextend: CommandFilter, lvextend, root
-
-# cinder/brick/local_dev/lvm.py: 'lvchange -a y -K <lv>'
-lvchange: CommandFilter, lvchange, root
-
-# cinder/volume/driver.py: 'iscsiadm', '-m', 'discovery', '-t',...
-# cinder/volume/driver.py: 'iscsiadm', '-m', 'node', '-T', ...
-iscsiadm: CommandFilter, iscsiadm, root
-
-# cinder/volume/drivers/lvm.py: 'shred', '-n3'
-# cinder/volume/drivers/lvm.py: 'shred', '-n0', '-z', '-s%dMiB'
-shred: CommandFilter, shred, root
-
-# cinder/volume/utils.py: utils.temporary_chown(path, 0)
-chown: CommandFilter, chown, root
-
-# cinder/volume/utils.py: copy_volume(..., ionice='...')
-ionice_1: ChainingRegExpFilter, ionice, root, ionice, -c[0-3], -n[0-7]
-ionice_2: ChainingRegExpFilter, ionice, root, ionice, -c[0-3]
-
-# cinder/volume/utils.py: setup_blkio_cgroup()
-cgcreate: CommandFilter, cgcreate, root
-cgset: CommandFilter, cgset, root
-cgexec: ChainingRegExpFilter, cgexec, root, cgexec, -g, blkio:\S+
-
-# cinder/volume/driver.py
-dmsetup: CommandFilter, dmsetup, root
-ln: CommandFilter, ln, root
-
-# cinder/image/image_utils.py
-qemu-img: EnvFilter, env, root, LC_ALL=C, qemu-img
-qemu-img_convert: CommandFilter, qemu-img, root
-
-udevadm: CommandFilter, udevadm, root
-
-# cinder/volume/driver.py: utils.read_file_as_root()
-cat: CommandFilter, cat, root
-
-# cinder/volume/nfs.py
-stat: CommandFilter, stat, root
-mount: CommandFilter, mount, root
-df: CommandFilter, df, root
-du: CommandFilter, du, root
-truncate: CommandFilter, truncate, root
-chmod: CommandFilter, chmod, root
-rm: CommandFilter, rm, root
-
-# cinder/volume/drivers/netapp/nfs.py:
-netapp_nfs_find: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -name, img-cache.*, -amin, \+\d+
-
-# cinder/volume/drivers/glusterfs.py
-chgrp: CommandFilter, chgrp, root
-umount: CommandFilter, umount, root
-fallocate: CommandFilter, fallocate, root
-
-# cinder/volumes/drivers/hds/hds.py:
-hus-cmd: CommandFilter, hus-cmd, root
-hus-cmd_local: CommandFilter, /usr/local/bin/hus-cmd, root
-
-# cinder/volumes/drivers/hds/hnas_backend.py
-ssc: CommandFilter, ssc, root
-
-# cinder/brick/initiator/connector.py:
-ls: CommandFilter, ls, root
-tee: CommandFilter, tee, root
-multipath: CommandFilter, multipath, root
-multipathd: CommandFilter, multipathd, root
-systool: CommandFilter, systool, root
-
-# cinder/volume/drivers/block_device.py
-blockdev: CommandFilter, blockdev, root
-
-# cinder/volume/drivers/ibm/gpfs.py
-# cinder/volume/drivers/tintri.py
-mv: CommandFilter, mv, root
-
-# cinder/volume/drivers/ibm/gpfs.py
-cp: CommandFilter, cp, root
-mmgetstate: CommandFilter, /usr/lpp/mmfs/bin/mmgetstate, root
-mmclone: CommandFilter, /usr/lpp/mmfs/bin/mmclone, root
-mmlsattr: CommandFilter, /usr/lpp/mmfs/bin/mmlsattr, root
-mmchattr: CommandFilter, /usr/lpp/mmfs/bin/mmchattr, root
-mmlsconfig: CommandFilter, /usr/lpp/mmfs/bin/mmlsconfig, root
-mmlsfs: CommandFilter, /usr/lpp/mmfs/bin/mmlsfs, root
-mmlspool: CommandFilter, /usr/lpp/mmfs/bin/mmlspool, root
-mkfs: CommandFilter, mkfs, root
-mmcrfileset: CommandFilter, /usr/lpp/mmfs/bin/mmcrfileset, root
-mmlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmlinkfileset, root
-mmunlinkfileset: CommandFilter, /usr/lpp/mmfs/bin/mmunlinkfileset, root
-mmdelfileset: CommandFilter, /usr/lpp/mmfs/bin/mmdelfileset, root
-mmcrsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmcrsnapshot, root
-mmdelsnapshot: CommandFilter, /usr/lpp/mmfs/bin/mmdelsnapshot, root
-
-# cinder/volume/drivers/ibm/gpfs.py
-# cinder/volume/drivers/ibm/ibmnas.py
-find_maxdepth_inum: RegExpFilter, find, root, find, ^[/]*([^/\0]+(/+)?)*$, -maxdepth, \d+, -inum, \d+
-
-# cinder/brick/initiator/connector.py:
-aoe-revalidate: CommandFilter, aoe-revalidate, root
-aoe-discover: CommandFilter, aoe-discover, root
-aoe-flush: CommandFilter, aoe-flush, root
-
-# cinder/brick/initiator/linuxscsi.py:
-sg_scan: CommandFilter, sg_scan, root
-
-#cinder/backup/services/tsm.py
-dsmc:CommandFilter,/usr/bin/dsmc,root
-
-# cinder/volume/drivers/hitachi/hbsd_horcm.py
-raidqry: CommandFilter, raidqry, root
-raidcom: CommandFilter, raidcom, root
-pairsplit: CommandFilter, pairsplit, root
-paircreate: CommandFilter, paircreate, root
-pairdisplay: CommandFilter, pairdisplay, root
-pairevtwait: CommandFilter, pairevtwait, root
-horcmstart.sh: CommandFilter, horcmstart.sh, root
-horcmshutdown.sh: CommandFilter, horcmshutdown.sh, root
-horcmgr: EnvFilter, env, root, HORCMINST=, /etc/horcmgr
-
-# cinder/volume/drivers/hitachi/hbsd_snm2.py
-auman: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auman
-auluref: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluref
-auhgdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgdef
-aufibre1: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aufibre1
-auhgwwn: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgwwn
-auhgmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auhgmap
-autargetmap: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetmap
-aureplicationvvol: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationvvol
-auluadd: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluadd
-auludel: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auludel
-auluchgsize: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auluchgsize
-auchapuser: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auchapuser
-autargetdef: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetdef
-autargetopt: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetopt
-autargetini: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/autargetini
-auiscsi: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/auiscsi
-audppool: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/audppool
-aureplicationlocal: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationlocal
-aureplicationmon: EnvFilter, env, root, LANG=, STONAVM_HOME=, LD_LIBRARY_PATH=, STONAVM_RSP_PASS=, STONAVM_ACT=, /usr/stonavm/aureplicationmon
-
-# cinder/volume/drivers/hgst.py
-vgc-cluster: CommandFilter, vgc-cluster, root
-
-# cinder/volume/drivers/vzstorage.py
-pstorage-mount: CommandFilter, pstorage-mount, root
-pstorage: CommandFilter, pstorage, root
-
-# initiator/connector.py:
-drv_cfg: CommandFilter, /opt/emc/scaleio/sdc/bin/drv_cfg, root, /opt/emc/scaleio/sdc/bin/drv_cfg, --query_guid