From b54a183dd82914e18bd3ddaae8605e029c4ad14d Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Fri, 30 Sep 2016 18:43:23 -0500 Subject: openstack p2, newton is done, will add heat later --- sys-cluster/cinder/Manifest | 3 + sys-cluster/cinder/cinder-2016.1.9999.ebuild | 2 +- sys-cluster/cinder/cinder-2016.2.9999.ebuild | 195 +++++++++++++++++++++++++++ sys-cluster/cinder/cinder-8.1.0.ebuild | 2 +- sys-cluster/cinder/cinder-8.1.1.ebuild | 2 +- 5 files changed, 201 insertions(+), 3 deletions(-) create mode 100644 sys-cluster/cinder/cinder-2016.2.9999.ebuild (limited to 'sys-cluster/cinder') diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest index 423c9d84f466..d46763c57bbf 100644 --- a/sys-cluster/cinder/Manifest +++ b/sys-cluster/cinder/Manifest @@ -4,3 +4,6 @@ DIST mitaka-cinder-api-paste.ini 2416 SHA256 3794a5e34dace60474274e93a7346662eb0 DIST mitaka-cinder-policy.json 4959 SHA256 5a9cd9d5d4cf80a9271fd7a5146d6d5415d10f8d699a8499a39a3cde29f50bd6 SHA512 b36daa51ab7719e1a56ca760e7ec62a98fb3a88ffed96196852023abf4ffe483200c9dcb934e3c7910fc6988f9c2bb9bb914121d0d649dc3b01466f467a82fe2 WHIRLPOOL f288b6dba2593fa6deb8ad94862948899ec10f71e4751f108ec1fbfff814c3206b5c541aaac0bb7edd2fb5311639a1cd3a44586855912cb2e0e675d5ad78161c DIST mitaka-cinder-volume.filters 9819 SHA256 20e4833aaf18b6be247e8ea2a0f63cc509ed595ea799c3ccfbcc1d0afc5bf9d8 SHA512 7b7aacdd843b960ed075b466e0bd7d2973a7733e7db63b4cb02df4b824a9528f6b7074870bf0048674e600bed983bc66caa1914963fff4aed00e8ab40e2ef600 WHIRLPOOL 32fb88041b8f38c821896d82139ea712ea0fc0a71bd6154e31887e85baf58d80b2c8bfd6c60b21613e522fe32fb022078091fcdc74110e5c9968826ae218c085 DIST mitaka-cinder.conf.sample 125293 SHA256 458d51db85e57beebbe054f60fccd2c159d70d7d31730558b7b3be36f7db4bef SHA512 0293211844321378843da79c5680d403c8e01fa8582d1d2b3e9e2a90548f39de949415e722039f3782cf8c96145a6de23a6db008d2eeea0c7bb56c45fd45ea4b WHIRLPOOL d71bd68a3bfb7527df1e20d4514904122acb0b598ee16dc248df8f0e633103eec1b88e73f6fa389692f65a57e1c5830eef513b2610e109bf440cb290b88ebe45 +DIST newton-cinder-policy.json 6412 SHA256 3a140134201452c52a97eae9f4c45ea30a3a21cc7a30ee619ed37ab0723b6479 SHA512 3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56 WHIRLPOOL f34dc729425fd82ddd9905c675fca9b765b4535dc87ec9d94acd1781c331e466f8688aace4954532e376e704cf3f1c8f4103f22e6838d4403c10311358e1ed2b +DIST newton-cinder-volume.filters 11025 SHA256 c36bdb9abb4d97350db9971dae1c44a713911920362a0c6c5bc3cfe2701dd4f6 SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d WHIRLPOOL 7496fffec8e42eb1c3bea39563cef8d48cb607b7de1ba8a4ac9a831b6def3dcbcfdf7d485aa81f52aa9bdf7600a51ba07ff85fbf88c5c70091ad88f8c01ca37e +DIST newton-cinder.conf.sample 50793 SHA256 5179c86590fb5c9477ec838f1ccb8cd9c481e8c31384eb7a012f296c68e0ddc1 SHA512 bf3b5fa262d7df57ca8a496724df449eb6c49ea951c1384b216af334db7cb948af5f7a5f24ddcebd4c80cca40da65e8aaa3a65f09ae2e184794ec1bf9bf466db WHIRLPOOL 7798325f7da5e236d49c8aec4218ef1e50e8e1bf8466f5fdb7b51844c5e6059868c9e4286afecefa637acd0e1df5315de2ac787947a31f4c51978529a54e1862 diff --git a/sys-cluster/cinder/cinder-2016.1.9999.ebuild b/sys-cluster/cinder/cinder-2016.1.9999.ebuild index 4dcaa3101cbd..79b9d7568133 100644 --- a/sys-cluster/cinder/cinder-2016.1.9999.ebuild +++ b/sys-cluster/cinder/cinder-2016.1.9999.ebuild @@ -168,7 +168,7 @@ python_install() { doins "etc/cinder/rootwrap.conf" newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini" newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json" - newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample" + newins "${DISTDIR}/mitaka-cinder.conf.sample" "cinder.conf.sample" insinto /etc/cinder/rootwrap.d newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters" diff --git a/sys-cluster/cinder/cinder-2016.2.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild new file mode 100644 index 000000000000..d9580fd641d1 --- /dev/null +++ b/sys-cluster/cinder/cinder-2016.2.9999.ebuild @@ -0,0 +1,195 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +PYTHON_COMPAT=( python2_7 python3_4 ) + +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 lio lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" +REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( || ( tgt lio ) ) 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.0.10[${PYTHON_USEDEP}] + =dev-python/sqlalchemy-1.0.10[${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 ) + lio? ( + sys-block/targetcli + sys-block/lio-utils + ) + 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="" + 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 + 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 + 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-8.1.0.ebuild b/sys-cluster/cinder/cinder-8.1.0.ebuild index 6f7138cd1996..cad860847db3 100644 --- a/sys-cluster/cinder/cinder-8.1.0.ebuild +++ b/sys-cluster/cinder/cinder-8.1.0.ebuild @@ -161,7 +161,7 @@ python_install() { doins "etc/cinder/rootwrap.conf" newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini" newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json" - newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample" + newins "${DISTDIR}/mitaka-cinder.conf.sample" "cinder.conf.sample" insinto /etc/cinder/rootwrap.d newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters" diff --git a/sys-cluster/cinder/cinder-8.1.1.ebuild b/sys-cluster/cinder/cinder-8.1.1.ebuild index 52e541f3e4bf..794ab97f0b90 100644 --- a/sys-cluster/cinder/cinder-8.1.1.ebuild +++ b/sys-cluster/cinder/cinder-8.1.1.ebuild @@ -161,7 +161,7 @@ python_install() { doins "etc/cinder/rootwrap.conf" newins "${DISTDIR}/mitaka-cinder-api-paste.ini" "api-paste.ini" newins "${DISTDIR}/mitaka-cinder-policy.json" "policy.json" - newins "${DISTDIR}/mitaka-cinder.conf.sample" "cidner.conf.sample" + newins "${DISTDIR}/mitaka-cinder.conf.sample" "cinder.conf.sample" insinto /etc/cinder/rootwrap.d newins "${DISTDIR}/mitaka-cinder-volume.filters" "volume.filters" -- cgit v1.2.3-65-gdbad