commit: 1e4fc9bc3aec675b3e2bb5187015ad2b1eaeb8b5
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 9 18:00:39 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 9 18:00:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e4fc9bc
sys-cluster/cinder: 11.1.0 stable amd64 and x86 with cleanup
Package-Manager: Portage-2.3.19, Repoman-2.3.6
sys-cluster/cinder/Manifest | 1 -
sys-cluster/cinder/cinder-11.0.2.ebuild | 209 --------------------------------
sys-cluster/cinder/cinder-11.1.0.ebuild | 2 +-
3 files changed, 1 insertion(+), 211 deletions(-)
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 3553bb27670..0053ff4ea8c 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,4 +1,3 @@
-DIST cinder-11.0.2.tar.gz 5794973 BLAKE2B
a7b59afbe3e27a2fde28a3dcb2ba3707c67223ae7e98cb34d0ac92beb16ab8f10c07f22fda091c9db9a02fd2eff4769a6e574a94cb19df1e9506c36321a12014
SHA512
6340150aa010a4372a7e51dc976974839f89b180eef61c9307c5b477dae98c8629a3f54cbc3d114dca28ca75c715930357cfc96d08f80acaabacee8f8c0bf3a6
DIST cinder-11.1.0.tar.gz 5813863 BLAKE2B
467ebe47d92b8a9c612b6d2c30ca9a3b737b33cf999c3612079cb6d6886ee986e60f9eb15bc6cd3e2adc7ab9c4e956ca41c9324c23f8892cdea9aedd1e1e035c
SHA512
193914d69144afba54bda7b3d05a8140501368c2fd44dd203dff5006228dad47602c4da244dc844781cff36581987ee236fc5238c7d78062e7cb78b8795b1f28
DIST cinder-12.0.0.tar.gz 5359294 BLAKE2B
85a7422ba3a562546cb192cabd6d9614adf8e4daa5cd86d98b6c3a49bd3ecea71027ce9e075f297f998d6539803f02505153fb09586928a159fce7683db6f680
SHA512
dbc65a0231ae584734a9cb9b29429a5ebecb15caf340237e8c3064b7e4c02793e6ec988554588aff46b825a44eac75fb748b25001ac28667752acc8fe199022d
DIST pike-cinder.conf.sample 185310 BLAKE2B
6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868
SHA512
12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
diff --git a/sys-cluster/cinder/cinder-11.0.2.ebuild
b/sys-cluster/cinder/cinder-11.0.2.ebuild
deleted file mode 100644
index b0f15626d2d..00000000000
--- a/sys-cluster/cinder/cinder-11.0.2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 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/pike/cinder.conf.sample
-> pike-cinder.conf.sample
-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-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}
- app-admin/sudo"
-
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${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/eventlet-0.20.1[${PYTHON_USEDEP}]
- <dev-python/eventlet-0.21.0[${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-3.1.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-4.0.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
- !~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-privsep-1.17.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-serialization-2.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.20.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.2.2[${PYTHON_USEDEP}]
- >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
- >=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
- !~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
- !~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
- >=dev-python/python-glanceclient-2.8.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.14.2[${PYTHON_USEDEP}]
- >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
- !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
- >=dev-python/routes-2.3.1[${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.5[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[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.5[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
- )
- >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- ~dev-python/suds-0.6[${PYTHON_USEDEP}]
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
- >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
- >=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
- >=dev-python/os-win-2.0.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.7.0[${PYTHON_USEDEP}]
- >=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
- !~dev-python/cryptography-2.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"
- doins "etc/cinder/policy.json"
- doins "etc/cinder/resource_filters.json"
- newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
- insinto /etc/cinder/rootwrap.d
- doins "etc/cinder/rootwrap.d/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.1.0.ebuild
b/sys-cluster/cinder/cinder-11.1.0.ebuild
index 36fac78bde8..b0f15626d2d 100644
--- a/sys-cluster/cinder/cinder-11.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-11.1.0.ebuild
@@ -13,7 +13,7 @@ https://tarballs.openstack.org/${PN}/${P}.tar.gz";
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+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 )"
