summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2014-08-01 05:13:55 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2014-08-01 05:13:55 +0000
commite2a0f6809afe733c35f87e8cb456e0545ef1d419 (patch)
tree46a486a12ac87fce937025ff39f8a8234e016fe9 /sys-cluster
parentupdating git master glance (diff)
downloadgentoo-2-e2a0f6809afe733c35f87e8cb456e0545ef1d419.tar.gz
gentoo-2-e2a0f6809afe733c35f87e8cb456e0545ef1d419.tar.bz2
gentoo-2-e2a0f6809afe733c35f87e8cb456e0545ef1d419.zip
updating git master cinder
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/cinder/ChangeLog5
-rw-r--r--sys-cluster/cinder/cinder-9999.ebuild87
2 files changed, 62 insertions, 30 deletions
diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index 4ceba5d2e617..314cf69e57ca 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-cluster/cinder
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.38 2014/07/26 23:09:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.39 2014/08/01 05:13:55 prometheanfire Exp $
+
+ 01 Aug 2014; Matthew Thode <prometheanfire@gentoo.org> cinder-9999.ebuild:
+ updating git master cinder
26 Jul 2014; Matthew Thode <prometheanfire@gentoo.org> cinder-2014.1.1.ebuild,
cinder-2014.1.9999.ebuild, cinder-9999.ebuild:
diff --git a/sys-cluster/cinder/cinder-9999.ebuild b/sys-cluster/cinder/cinder-9999.ebuild
index a1d04859f162..d27de07d05ac 100644
--- a/sys-cluster/cinder/cinder-9999.ebuild
+++ b/sys-cluster/cinder/cinder-9999.ebuild
@@ -1,43 +1,69 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-9999.ebuild,v 1.8 2014/07/26 23:09:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-9999.ebuild,v 1.9 2014/08/01 05:13:55 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 eutils git-2 user
-DESCRIPTION="Cinder is the OpenStack Block storage service. This is a spin out
-of nova-volumes."
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes."
HOMEPAGE="https://launchpad.net/cinder"
EGIT_REPO_URI="https://github.com/openstack/cinder.git"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS=""
-IUSE="+api +scheduler +volume mysql postgres sqlite"
+IUSE="+api +scheduler +volume mysql postgres sqlite test"
REQUIRED_USE="|| ( mysql postgres sqlite )"
#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- app-admin/sudo"
+ >=dev-python/pbr-0.6[${PYTHON_USEDEP}]
+ <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+ app-admin/sudo
+ test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+ <dev-python/hacking-0.9[${PYTHON_USEDEP}]
+ >=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+ >=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+ >=dev-python/hp3parclient-3.0[${PYTHON_USEDEP}]
+ <dev-python/hp3parclient-4.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0[${PYTHON_USEDEP}]
+ >=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/psycopg[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+ <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+ >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+ >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+ >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+ dev-python/oslo-sphinx[${PYTHON_USEDEP}] )"
-RDEPEND=">=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
+RDEPEND="=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+ >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
>=dev-python/eventlet-0.13.0[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+ >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
>=dev-python/kombu-2.4.8[${PYTHON_USEDEP}]
- >=dev-python/lockfile-0.8[${PYTHON_USEDEP}]
>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
- dev-python/netaddr[${PYTHON_USEDEP}]
- >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
- >=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
- <dev-python/pbr-1.0[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- >=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
- <dev-python/webob-1.3[${PYTHON_USEDEP}]
- >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
- >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
+ dev-python/oslo-rootwrap[${PYTHON_USEDEP}]
+ >=dev-python/paramiko-1.9.0[${PYTHON_USEDEP}]
dev-python/paste[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
+ >=dev-python/python-keystoneclient-0.7.0[${PYTHON_USEDEP}]
+ >=dev-python/python-novaclient-2.17.0[${PYTHON_USEDEP}]
+ >=dev-python/python-swiftclient-1.6[${PYTHON_USEDEP}]
+ >=dev-python/requests-1.1[${PYTHON_USEDEP}]
+ >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+ >=dev-python/taskflow-0.1.3[${PYTHON_USEDEP}]
+ <dev-python/taskflow-0.2[${PYTHON_USEDEP}]
+ >=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
+ >=dev-python/six-1.5.2[${PYTHON_USEDEP}]
sqlite? (
>=dev-python/sqlalchemy-0.8.0[sqlite,${PYTHON_USEDEP}]
!~dev-python/sqlalchemy-0.9.5[sqlite,${PYTHON_USEDEP}]
@@ -56,19 +82,13 @@ RDEPEND=">=dev-python/amqplib-0.6.1-r1[${PYTHON_USEDEP}]
<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
)
>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
- >=dev-python/stevedore-0.10[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-0.14[${PYTHON_USEDEP}]
>=dev-python/suds-0.4[${PYTHON_USEDEP}]
- >=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
- >=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
- >=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
- >=dev-python/python-glanceclient-0.9.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-0.3.0[${PYTHON_USEDEP}]
- >=dev-python/python-swiftclient-1.5[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
- <dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
>=sys-block/iscsitarget-1.4.20.2_p20130821
sys-fs/lvm2
- sys-block/open-iscsi"
+ sys-block/open-iscsi
+ sys-fs/sysfsutils"
PATCHES=( )
@@ -77,18 +97,26 @@ pkg_setup() {
enewuser cinder -1 -1 /var/lib/cinder cinder
}
+#python_compile_all() { leave for next attempt
+# use doc && emake -C doc html
+#}
+
+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
newinitd "${FILESDIR}/cinder-init" "cinder"
newconfd "${FILESDIR}/cinder-confd" "cinder"
use api && dosym /etc/init.d/cinder /etc/init.d/cinder-api
use scheduler && dosym /etc/init.d/cinder /etc/init.d/cinder-scheduler
use volume && dosym /etc/init.d/cinder /etc/init.d/cinder-volume
- keepdir /etc/cinder
- dodir /etc/cinder/rootwrap.d
insinto /etc/cinder
-
newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
@@ -96,6 +124,7 @@ python_install() {
newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
insinto /etc/cinder/rootwrap.d
newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
#add sudoers definitions for user nova
insinto /etc/sudoers.d/
doins "${FILESDIR}/cinder-sudoers"