From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F2F615808D for ; Tue, 19 Apr 2022 18:31:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 874E2E0920; Tue, 19 Apr 2022 18:31:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 259D0E091A for ; Tue, 19 Apr 2022 18:31:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0C866341B6F for ; Tue, 19 Apr 2022 18:31:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A47ED355 for ; Tue, 19 Apr 2022 18:31:30 +0000 (UTC) From: "Alessandro Barbieri" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alessandro Barbieri" Message-ID: <1650393085.d3dae0aa2a6a890c42778efa1b32754ab1979598.Alessandro-Barbieri@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: sys-cluster/cinder/ X-VCS-Repository: repo/proj/guru X-VCS-Files: sys-cluster/cinder/cinder-20.0.0.ebuild sys-cluster/cinder/metadata.xml X-VCS-Directories: sys-cluster/cinder/ X-VCS-Committer: Alessandro-Barbieri X-VCS-Committer-Name: Alessandro Barbieri X-VCS-Revision: d3dae0aa2a6a890c42778efa1b32754ab1979598 X-VCS-Branch: dev Date: Tue, 19 Apr 2022 18:31:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 29c953c3-2a61-4444-9245-7bee8b85d959 X-Archives-Hash: 637b4a2b19489954ae2e042780c50e5a commit: d3dae0aa2a6a890c42778efa1b32754ab1979598 Author: Alessandro Barbieri gmail com> AuthorDate: Mon Apr 18 02:51:09 2022 +0000 Commit: Alessandro Barbieri gmail com> CommitDate: Tue Apr 19 18:31:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d3dae0aa sys-cluster/cinder: remove optional dependencies Signed-off-by: Alessandro Barbieri gmail.com> sys-cluster/cinder/cinder-20.0.0.ebuild | 45 +++++---------------------------- sys-cluster/cinder/metadata.xml | 11 -------- 2 files changed, 7 insertions(+), 49 deletions(-) diff --git a/sys-cluster/cinder/cinder-20.0.0.ebuild b/sys-cluster/cinder/cinder-20.0.0.ebuild index 8a4bdcb48..049920fee 100644 --- a/sys-cluster/cinder/cinder-20.0.0.ebuild +++ b/sys-cluster/cinder/cinder-20.0.0.ebuild @@ -20,7 +20,7 @@ KEYWORDS="~amd64" LICENSE="Apache-2.0 GPL-2" SLOT="0" -IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt" +IUSE="test" # qemu is needed for image conversion RDEPEND=" @@ -86,23 +86,7 @@ RDEPEND=" >=dev-python/zstd-1.4.5.1[${PYTHON_USEDEP}] >=dev-python/boto3-1.16.51[${PYTHON_USEDEP}] - iscsi? ( - tgt? ( sys-block/tgt ) - sys-block/open-iscsi - ) - lvm? ( sys-fs/lvm2 ) - memcached? ( net-misc/memcached ) - mysql? ( - >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.4.23[${PYTHON_USEDEP}] - ) - sqlite? ( - >=dev-python/sqlalchemy-1.4.23[sqlite,${PYTHON_USEDEP}] - ) - postgres? ( - >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] - >=dev-python/sqlalchemy-1.4.23[${PYTHON_USEDEP}] - ) + >=dev-python/sqlalchemy-1.4.23[${PYTHON_USEDEP}] acct-user/cinder acct-group/cinder @@ -119,29 +103,16 @@ BDEPEND=" >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}] >=dev-python/oslotest-4.5.0[${PYTHON_USEDEP}] >=dev-python/testtools-2.4.0[${PYTHON_USEDEP}] + >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}] + >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}] ) " RESTRICT="!test? ( test )" -REQUIRED_USE=" - || ( mysql postgres sqlite ) - iscsi? ( tgt ) - infiniband? ( rdma ) - test? ( mysql postgres ) -" 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 + CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP " if linux_config_exists; then for module in ${CONFIG_CHECK_MODULES}; do linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled" @@ -201,8 +172,6 @@ python_install_all() { pkg_postinst() { tmpfiles_process cinder.conf - 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 + 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" } diff --git a/sys-cluster/cinder/metadata.xml b/sys-cluster/cinder/metadata.xml index 51c36e900..60948bb4b 100644 --- a/sys-cluster/cinder/metadata.xml +++ b/sys-cluster/cinder/metadata.xml @@ -6,17 +6,6 @@ lssndrbarbieri@gmail.com Alessandro Barbieri - - Installs the initscripts for the cinder api service - Allow using an iSCSI remote storage server as pool for disk image storage - Allow using the Logical Volume Manager (sys-fs/lvm2) as pool for disk image storage - Installs the memcached server - Enable rdma storage backend support - Installs the initscripts for the cinder scheduler service - Enables tcp support for the iscsi backend - Enable tgt storage backend support - Installs the initscripts for the cinder volume service - cinder