From 45cba86466993a043dd4ecece16ff64845f0bd81 Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Fri, 30 Oct 2015 09:12:09 -0500 Subject: Revert "sys-cluster/cinder: Drop old" This reverts commit 90ba857a08b1738af9feae9165728fa8387828c1. --- sys-cluster/cinder/Manifest | 1 + sys-cluster/cinder/cinder-7.0.0.ebuild | 244 +++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+) create mode 100644 sys-cluster/cinder/cinder-7.0.0.ebuild diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest index c34b7a06fb8..f898fca29dd 100644 --- a/sys-cluster/cinder/Manifest +++ b/sys-cluster/cinder/Manifest @@ -1,3 +1,4 @@ DIST cinder-2015.1.1.tar.gz 2068679 SHA256 11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313 WHIRLPOOL a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9 DIST cinder-2015.1.2.tar.gz 2079511 SHA256 8baa42a3008b0bb0870df678237c0d06ab8ee148b3bf5c00c6b95cfe05c52333 SHA512 312b89068b80c642b8055084575e378ae449b615b6135f15f7aa327808e7a4f05887d0626dc69329c8d08001cf8a8488453b783a81c0f083340e15a8dd411f26 WHIRLPOOL dc3b532603167ac7a910120aca122d54646190c9d1a38a024d03675051b726f09f62d55f8bf5e404d83f8a9df8968bd953c3abf30d6eb45851134d399177fa7e +DIST cinder-7.0.0.tar.gz 2584282 SHA256 8c6b0729ca6a5eaed273b1ca918064e0fd29bcbc537e19ba4dd9cdc73a090933 SHA512 6c34c28450f7eee435df9a59ea4ddbb8209e168b5399e2022223aa76001fd31d00ae0b0012cee5a32f887321a6c3b9f02d206edf99b08fd08d909734e0720f44 WHIRLPOOL 5a116e024d7bc0aad5aef70b59b2d4de8dbbc64f79f0a348d102bed57ecbfcb8f24f79f0e52dbd2bbfd74d6585d01529bea4126e2228cd2cc13507a5cf8d0781 DIST liberty-cinder.conf.sample 122223 SHA256 dad765cbe995576c23b4aa45e316272826fd9a293bf111bcdcb2da9ab562fb43 SHA512 64696a606233fa6a0f2c844924a61e48552f38ce54dadbc8202455d32b9fa37575c8e1d5c1b3e086d37f832e60f754007f2bfa9cd4915e3ae5fd52e283896f64 WHIRLPOOL 2d03754cfe60be0b0f278181e3b9cec399227e643032d9bb53fdafb4504793da6459ceb9b93802d5452ab9b77d9b613ff87f04605833553011a0847d9d3f7e2c diff --git a/sys-cluster/cinder/cinder-7.0.0.ebuild b/sys-cluster/cinder/cinder-7.0.0.ebuild new file mode 100644 index 00000000000..8b9c75b17d7 --- /dev/null +++ b/sys-cluster/cinder/cinder-7.0.0.ebuild @@ -0,0 +1,244 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +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://launchpad.net/${PN}/liberty/${PV}/+download/${P}.tar.gz + https://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample -> liberty-cinder.conf.sample" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test" +REQUIRED_USE="|| ( mysql postgres sqlite )" + +CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]" +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND} + app-admin/sudo + test? ( + ${RDEPEND} + >=dev-python/coverage-3.6[${PYTHON_USEDEP}] + <=dev-python/coverage-4.0[${PYTHON_USEDEP}] + >=dev-python/ddt-0.7.0[${PYTHON_USEDEP}] + <=dev-python/ddt-1.0.0[${PYTHON_USEDEP}] + ~dev-python/fixtures-1.3.1[${PYTHON_USEDEP}] + >=dev-python/mock-1.2[${PYTHON_USEDEP}] + <=dev-python/mock-1.3.0[${PYTHON_USEDEP}] + >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}] + <=dev-python/mox3-0.10.0[${PYTHON_USEDEP}] + >=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}] + <=dev-python/pymysql-0.6.6[${PYTHON_USEDEP}] + >=dev-python/psycopg-2.5[${PYTHON_USEDEP}] + <=dev-python/psycopg-2.6.1[${PYTHON_USEDEP}] + >=dev-python/oslotest-1.10.0[${PYTHON_USEDEP}] + <=dev-python/oslotest-1.11.0[${PYTHON_USEDEP}] + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] + !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}] + =dev-python/subunit-0.0.18[${PYTHON_USEDEP}] + <=dev-python/subunit-1.1.0[${PYTHON_USEDEP}] + >=dev-python/testtools-1.4.0[${PYTHON_USEDEP}] + <=dev-python/testtools-1.8.0[${PYTHON_USEDEP}] + >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}] + <=dev-python/testrepository-0.0.20[${PYTHON_USEDEP}] + >=dev-python/testresources-0.2.4[${PYTHON_USEDEP}] + <=dev-python/testresources-0.2.7-r9999[${PYTHON_USEDEP}] + >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] + <=dev-python/testscenarios-0.5[${PYTHON_USEDEP}] + >=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}] + <=dev-python/oslo-sphinx-3.2.0[${PYTHON_USEDEP}] + >=dev-python/os-testr-0.1.0[${PYTHON_USEDEP}] + <=dev-python/os-testr-0.3.0[${PYTHON_USEDEP}] + >=dev-python/tempest-lib-0.8.0[${PYTHON_USEDEP}] + <=dev-python/tempest-lib-0.9.0[${PYTHON_USEDEP}] + >=dev-python/bandit-0.13.2[${PYTHON_USEDEP}] + <=dev-python/bandit-0.13.2[${PYTHON_USEDEP}] + )" + +RDEPEND=" + ${CDEPEND} + ~dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] + >=dev-python/Babel-1.3[${PYTHON_USEDEP}] + <=dev-python/Babel-2.0[${PYTHON_USEDEP}] + <=dev-python/enum34-1.0.4[$(python_gen_usedep 'python2_7')] + >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] + <=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + <=dev-python/greenlet-0.4.9[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}] + <=dev-python/iso8601-0.1.10[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-2.0.0[${PYTHON_USEDEP}] + <=dev-python/keystonemiddleware-2.3.1[${PYTHON_USEDEP}] + >=dev-python/kombu-3.0.7[${PYTHON_USEDEP}] + <=dev-python/kombu-3.0.26[${PYTHON_USEDEP}] + >=dev-python/lxml-2.3[${PYTHON_USEDEP}] + <=dev-python/lxml-3.4.4[${PYTHON_USEDEP}] + >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}] + !~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}] + <=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}] + >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}] + <=dev-python/oslo-config-2.4.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}] + <=dev-python/oslo-concurrency-2.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}] + <=dev-python/oslo-context-0.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-db-2.4.1[${PYTHON_USEDEP}] + <=dev-python/oslo-db-2.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-log-1.8.0[${PYTHON_USEDEP}] + <=dev-python/oslo-log-1.11.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-1.16.0[${PYTHON_USEDEP}] + !~dev-python/oslo-messaging-1.17.0[${PYTHON_USEDEP}] + !~dev-python/oslo-messaging-1.17.1[${PYTHON_USEDEP}] + <=dev-python/oslo-messaging-2.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}] + <=dev-python/oslo-middleware-2.8.0[${PYTHON_USEDEP}] + >=dev-python/oslo-policy-0.5.0[${PYTHON_USEDEP}] + <=dev-python/oslo-policy-0.11.0[${PYTHON_USEDEP}] + >=dev-python/oslo-reports-0.1.0[${PYTHON_USEDEP}] + <=dev-python/oslo-reports-0.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-rootwrap-2.0.0[${PYTHON_USEDEP}] + <=dev-python/oslo-rootwrap-2.3.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}] + <=dev-python/oslo-serialization-1.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-service-0.7.0[${PYTHON_USEDEP}] + <=dev-python/oslo-service-0.9.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}] + <=dev-python/oslo-utils-2.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-versionedobjects-0.9.0[${PYTHON_USEDEP}] + <=dev-python/oslo-versionedobjects-0.10.0[${PYTHON_USEDEP}] + ~dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}] + >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}] + <=dev-python/paramiko-1.15.2[${PYTHON_USEDEP}] + <=dev-python/paste-2.0.2[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] + <=dev-python/pastedeploy-1.5.2[${PYTHON_USEDEP}] + >=dev-python/pycrypto-2.6[${PYTHON_USEDEP}] + <=dev-python/pycrypto-2.6.1[${PYTHON_USEDEP}] + >=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}] + <=dev-python/pyparsing-2.0.3[${PYTHON_USEDEP}] + ~dev-python/python-barbicanclient-3.3.0[${PYTHON_USEDEP}] + >=dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}] + <=dev-python/python-glanceclient-1.1.0[${PYTHON_USEDEP}] + >=dev-python/python-novaclient-2.28.1[${PYTHON_USEDEP}] + <=dev-python/python-novaclient-2.30.1[${PYTHON_USEDEP}] + >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}] + <=dev-python/python-swiftclient-2.6.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.5.2[${PYTHON_USEDEP}] + <=dev-python/requests-2.7.0[${PYTHON_USEDEP}] + >=dev-python/retrying-1.2.3[${PYTHON_USEDEP}] + !~dev-python/retrying-1.3.0[${PYTHON_USEDEP}] + <=dev-python/retrying-1.3.3[${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.2[${PYTHON_USEDEP}] + >=dev-python/taskflow-1.16.0[${PYTHON_USEDEP}] + <=dev-python/taskflow-1.21.0[${PYTHON_USEDEP}] + >=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}] + <=dev-python/rtslib-fb-2.1.57[${PYTHON_USEDEP}] + ~dev-python/six-1.9.0[${PYTHON_USEDEP}] + sqlite? ( + >=dev-python/sqlalchemy-0.9.9[sqlite,${PYTHON_USEDEP}] + =dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}] + =dev-python/sqlalchemy-0.9.9[${PYTHON_USEDEP}] + =dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}] + <=dev-python/sqlalchemy-migrate-0.10.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}] + <=dev-python/stevedore-1.8.0[${PYTHON_USEDEP}] + ~dev-python/suds-0.6[${PYTHON_USEDEP}] + >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}] + <=dev-python/webob-1.4.1[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}] + <=dev-python/oslo-i18n-2.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-vmware-0.16.0[${PYTHON_USEDEP}] + <=dev-python/oslo-vmware-1.21.0[${PYTHON_USEDEP}] + >=dev-python/os-brick-0.4.0[${PYTHON_USEDEP}] + <=dev-python/os-brick-0.5.0[${PYTHON_USEDEP}] + iscsi? ( + 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_setup() { + linux-info_pkg_setup + CONFIG_CHECK_MODULES="ISCSI_TCP" + if linux_config_exists; then + for module in ${CONFIG_CHECK_MODULES}; do + linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)" + done + fi + 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() { + distutils-r1_python_install + 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 + newins "${FILESDIR}/etc.liberty/api-httpd.conf" "api-httpd.conf" + newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini" + newins "${DISTDIR}/liberty-cinder.conf.sample" "cinder.conf.sample" + newins "${FILESDIR}/etc.liberty/logging_sample.conf" "logging_sample.conf" + newins "${FILESDIR}/etc.liberty/policy.json" "policy.json" + newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf" + insinto /etc/cinder/rootwrap.d + newins "${FILESDIR}/etc.liberty/rootwrap.d/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 +} -- cgit v1.2.1