From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Apr 2020 11:37:10 +0100 Subject: gentoo resync : 25.04.2020 --- sys-cluster/cinder/Manifest | 7 +- sys-cluster/cinder/cinder-15.0.1.ebuild | 213 --------------------------- sys-cluster/cinder/cinder-15.1.0-r1.ebuild | 210 ++++++++++++++++++++++++++ sys-cluster/cinder/cinder-15.1.0.ebuild | 210 -------------------------- sys-cluster/cinder/cinder-2019.2.9999.ebuild | 2 +- 5 files changed, 213 insertions(+), 429 deletions(-) delete mode 100644 sys-cluster/cinder/cinder-15.0.1.ebuild create mode 100644 sys-cluster/cinder/cinder-15.1.0-r1.ebuild delete mode 100644 sys-cluster/cinder/cinder-15.1.0.ebuild (limited to 'sys-cluster/cinder') diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest index ef3e6f447ebb..c31b83ba54f3 100644 --- a/sys-cluster/cinder/Manifest +++ b/sys-cluster/cinder/Manifest @@ -1,11 +1,8 @@ AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 -DIST cinder-15.0.1.tar.gz 5516811 BLAKE2B 081b3a6175303c783ff23122d409814812fdab2a7955174cd90b57ea62c055c1e39936d8e8a38e21fc2820e7069e0afc91fa46a490f539f518f33302067b4acd SHA512 7a63f25bcd6beedc60bb4a6b976d8b1f862b445a6d858e2fbbf53f4ff425d8bee094af354883a46c6226349d7557d45a649cd745e79a445e32b759b24294116f DIST cinder-15.1.0.tar.gz 5504663 BLAKE2B 19097821729c99f0a13f0c30c9fa2c8647fe4c6ae01790b59b264fad282f1051e5e3f3275720114b1575afcbef517baab89a34ce75b7ef54d6515c204907f28a SHA512 1c6c88854994d440c3818d26533ea075adfcfc4b8642b2796d1ac90a5feec5e3c8d64d06f433840afcf2d9d4f5a50ba256808b74495e0e735a3f0a19bdc838e3 -DIST cinder.conf.sample-15.0.1 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a DIST cinder.conf.sample-15.1.0 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a DIST cinder.conf.sample-2019.2.9999 183153 BLAKE2B fb86b82c711568c89a445c5876a1d5e890714d4dd957d4aa5b3158a3c85150e75d8d0055a93bf6a937d8a6f5a3c4042c5ddb4b4da2dd006d77d8eb8ec8a19fc5 SHA512 95a2076970184bc34c9c293371f72a791f16600c4933572b8d51291c506a7c1ef3bd2ea185f1f4dafeff6c85a237f4453f8ee6c1df6af7f603afe1ddfd63cd3a -EBUILD cinder-15.0.1.ebuild 7734 BLAKE2B 4ff524caf8e8ccc741b307ab21e3597a495712a11c8dc59d127e274a87bf52c14e65c38fa78b0c1db60f11652d36f249fdc79efba9de30cae28a47387d4cbf02 SHA512 2db77c8f068716112617ecb0bbd5e49e95d7e8bc2d8c93b4de4d57f3fe372214fdb16648592e166c2effcaeb83a9ff7c5c64447fa6e798e0fa236f9cd73bb511 -EBUILD cinder-15.1.0.ebuild 7687 BLAKE2B f436f56df12ccb7b2a9c7994ce702021dd0386de702efa4bfc99b6ed9410230a3c0872fa9b08c501dba9cd9223464da3ea235a45b8a85ca5905c33f78e992596 SHA512 fd298c23064fe56047a04e38699552b26e7e44aa35de93b81e5cb7ffc553b36a604d0b81f751014475031517075d97c387984ab1cf68cbe429d52f22966a2cd3 -EBUILD cinder-2019.2.9999.ebuild 7687 BLAKE2B f436f56df12ccb7b2a9c7994ce702021dd0386de702efa4bfc99b6ed9410230a3c0872fa9b08c501dba9cd9223464da3ea235a45b8a85ca5905c33f78e992596 SHA512 fd298c23064fe56047a04e38699552b26e7e44aa35de93b81e5cb7ffc553b36a604d0b81f751014475031517075d97c387984ab1cf68cbe429d52f22966a2cd3 +EBUILD cinder-15.1.0-r1.ebuild 7725 BLAKE2B 9030f02232344ed4766bc083de914f28b05411f6548c96d77cfb8bf6a3f2235666af44a06804f515df8a70e1512595c904e6ef2396e4d220b549eded07822bb9 SHA512 634c3cce3444ef915af124dcabf83c2f5ceeaba535cfab56b700a146ef3365891b273e046c5feaa308805dfc023ebe4cf669c1c0a7c875ffe372e2bfd536a300 +EBUILD cinder-2019.2.9999.ebuild 7727 BLAKE2B 6db8b0067861be958f16707937bb7c2345cbba8d49357610dd358d485b6bb3930629adc469b5f50de3360dbdf9acb8ae30baf08995bda0dd14ff0e1d61c0cc65 SHA512 d8b5041ed0fed6addbc626d1faaf6adce7e1fc47ff3845f2db25658b691bc58044b7f2b56b7442f2fc0651d0da4b7315e003a513b100e097af44971b677d8a89 MISC metadata.xml 1244 BLAKE2B bac3f4931079ae89c48d66ed2fe689978fcf609638ade7b26d8f07ffbd6562d7c4a16b42dec4390654747c6d2dfcb92b73d27c90356f1928199469d42432ef69 SHA512 fda201e6974bb0af9c24c1384a3bb2dd0a0c630439d7f1955de336f53804070a68426919fd4dc6f864d502c7e9e99a80d1920c740b6dc179f7b46c7f7fb7aef9 diff --git a/sys-cluster/cinder/cinder-15.0.1.ebuild b/sys-cluster/cinder/cinder-15.0.1.ebuild deleted file mode 100644 index 8c8f4a9cfe8c..000000000000 --- a/sys-cluster/cinder/cinder-15.0.1.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -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" - -if [[ ${PV} == *9999 ]];then - inherit git-r3 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}" - EGIT_REPO_URI="https://github.com/openstack/cinder.git" - EGIT_BRANCH="stable/train" -else - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV} - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" -RESTRICT="!test? ( test )" -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/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] - >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] - >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - =dev-python/psutil-3.2.2[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-9.1.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/requests-2.20.0[${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-3.2.0[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}] - >=dev-python/six-1.10.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-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}] - >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] - >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] - >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] - >=dev-python/cursive-0.2.1[${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 - # only used for docs - sed -i '/^sphinx-feature-classification/d' 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/resource_filters.json" - newins "${DISTDIR}/cinder.conf.sample-${PV}" "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 - # stupid python - rm -r "${ED}"/usr/etc -} - -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-15.1.0-r1.ebuild b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild new file mode 100644 index 000000000000..7e28298f02b3 --- /dev/null +++ b/sys-cluster/cinder/cinder-15.1.0-r1.ebuild @@ -0,0 +1,210 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7} ) +inherit distutils-r1 eutils linux-info + +DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" +HOMEPAGE="https://launchpad.net/cinder" + +if [[ ${PV} == *9999 ]];then + inherit git-r3 + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}" + EGIT_REPO_URI="https://github.com/openstack/cinder.git" + EGIT_BRANCH="stable/train" +else + SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV} + https://tarballs.openstack.org/${PN}/${P}.tar.gz" + KEYWORDS="amd64 ~arm64 x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" +RESTRICT="!test? ( test )" +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" + +# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated +RDEPEND=" + ${CDEPEND} + >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] + >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}] + >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}] + !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] + !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] + >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] + >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] + >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] + >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] + >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] + !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] + >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] + >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] + >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] + >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] + >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}] + >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] + >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}] + >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}] + >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] + >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] + !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] + >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] + !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] + >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}] + >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] + >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] + >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] + >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] + >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] + >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] + =dev-python/psutil-3.2.2[${PYTHON_USEDEP}] + >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] + >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}] + >=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}] + >=dev-python/python-novaclient-9.1.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/requests-2.20.0[${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-3.2.0[${PYTHON_USEDEP}] + >=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}] + >=dev-python/six-1.10.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-3.15.3[${PYTHON_USEDEP}] + >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] + >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}] + >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] + >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] + >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] + >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] + >=dev-python/cursive-0.2.1[${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 + acct-user/cinder + acct-group/cinder" +# 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 +} + +python_prepare_all() { + sed -i '/^hacking/d' test-requirements.txt || die + # only used for docs + sed -i '/^sphinx-feature-classification/d' 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/resource_filters.json" + newins "${DISTDIR}/cinder.conf.sample-${PV}" "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 + # stupid python + rm -r "${ED}"/usr/etc +} + +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-15.1.0.ebuild b/sys-cluster/cinder/cinder-15.1.0.ebuild deleted file mode 100644 index dd0bb4f9d5bc..000000000000 --- a/sys-cluster/cinder/cinder-15.1.0.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6,7} ) -inherit distutils-r1 eutils linux-info - -DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes" -HOMEPAGE="https://launchpad.net/cinder" - -if [[ ${PV} == *9999 ]];then - inherit git-r3 - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV}" - EGIT_REPO_URI="https://github.com/openstack/cinder.git" - EGIT_BRANCH="stable/train" -else - SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/train/cinder.conf.sample -> cinder.conf.sample-${PV} - https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" -RESTRICT="!test? ( test )" -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/decorator-3.4.0[${PYTHON_USEDEP}] - >=dev-python/defusedxml-0.5.0[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.22.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}] - !~dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.4.1[${PYTHON_USEDEP}] - >=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}] - >=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}] - >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}] - >=dev-python/keystoneauth-3.7.0[${PYTHON_USEDEP}] - >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] - >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] - !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] - >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] - >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] - >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] - >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}] - >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}] - >=dev-python/oslo-messaging-6.4.0[${PYTHON_USEDEP}] - >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}] - >=dev-python/oslo-policy-1.44.1[${PYTHON_USEDEP}] - >=dev-python/oslo-privsep-1.32.0[${PYTHON_USEDEP}] - >=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}] - >=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}] - >=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}] - !~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}] - >=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}] - !~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}] - >=dev-python/oslo-upgradecheck-0.1.0[${PYTHON_USEDEP}] - >=dev-python/oslo-utils-3.34.0[${PYTHON_USEDEP}] - >=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}] - >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}] - >=dev-python/paramiko-2.0.0[${PYTHON_USEDEP}] - >=dev-python/paste-2.0.2[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}] - >=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}] - =dev-python/psutil-3.2.2[${PYTHON_USEDEP}] - >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] - >=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}] - >=dev-python/python-glanceclient-2.15.0[${PYTHON_USEDEP}] - >=dev-python/python-keystoneclient-3.15.0[${PYTHON_USEDEP}] - >=dev-python/python-novaclient-9.1.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/requests-2.20.0[${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-3.2.0[${PYTHON_USEDEP}] - >=dev-python/rtslib-fb-2.1.65[${PYTHON_USEDEP}] - >=dev-python/six-1.10.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-3.15.3[${PYTHON_USEDEP}] - >=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}] - >=dev-python/os-brick-2.2.0[${PYTHON_USEDEP}] - >=dev-python/os-win-3.0.0[${PYTHON_USEDEP}] - >=dev-python/tooz-1.58.0[${PYTHON_USEDEP}] - >=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}] - >=dev-python/castellan-0.16.0[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.1[${PYTHON_USEDEP}] - >=dev-python/cursive-0.2.1[${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 - acct-user/cinder - acct-group/cinder" -# 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 -} - -python_prepare_all() { - sed -i '/^hacking/d' test-requirements.txt || die - # only used for docs - sed -i '/^sphinx-feature-classification/d' 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/resource_filters.json" - newins "${DISTDIR}/cinder.conf.sample-${PV}" "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 - # stupid python - rm -r "${ED}"/usr/etc -} - -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-2019.2.9999.ebuild b/sys-cluster/cinder/cinder-2019.2.9999.ebuild index dd0bb4f9d5bc..a4f149da4e04 100644 --- a/sys-cluster/cinder/cinder-2019.2.9999.ebuild +++ b/sys-cluster/cinder/cinder-2019.2.9999.ebuild @@ -32,6 +32,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] ${CDEPEND} app-admin/sudo" +# >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] # do not include, upstream depricated RDEPEND=" ${CDEPEND} >=dev-python/decorator-3.4.0[${PYTHON_USEDEP}] @@ -47,7 +48,6 @@ RDEPEND=" >=dev-python/keystonemiddleware-4.21.0[${PYTHON_USEDEP}] >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] !~dev-python/lxml-3.7.0[${PYTHON_USEDEP}] - >=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}] >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}] >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}] >=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}] -- cgit v1.2.3