commit: 0c612788e8b2a476a9a86707563e73bfa2d4062d
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Mon Apr 18 03:05:18 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Tue Apr 19 18:31:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0c612788
sys-cluster/nova: remove optional dependencies
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
sys-cluster/nova/files/scsi-openscsi-link.sh | 2 +-
sys-cluster/nova/metadata.xml | 6 ---
.../{nova-25.0.0.ebuild => nova-25.0.0-r1.ebuild} | 47 ++++------------------
3 files changed, 9 insertions(+), 46 deletions(-)
diff --git a/sys-cluster/nova/files/scsi-openscsi-link.sh
b/sys-cluster/nova/files/scsi-openscsi-link.sh
index 197eac443..663aeab86 100644
--- a/sys-cluster/nova/files/scsi-openscsi-link.sh
+++ b/sys-cluster/nova/files/scsi-openscsi-link.sh
@@ -13,7 +13,7 @@
# Requirements: lsscsi (for retrieve LUN ID, I don't know how can i do that
from udev/iscsiadm)
# Rules for UDEV must in this format:
-# KERNEL=="sd*", BUS=="scsi", PROGRAM="/etc/nova/scsi-openscsi-link.sh
%b",SYMLINK+="disk/by-path/%c"
+# KERNEL=="sd*", BUS=="scsi", PROGRAM="/usr/libexec/nova/scsi-openscsi-link.sh
%b",SYMLINK+="disk/by-path/%c"
# NOTE: it seems that input params %b or others are not passed to script.
# I try to retrieve it from environment variables.
diff --git a/sys-cluster/nova/metadata.xml b/sys-cluster/nova/metadata.xml
index 5a21e5fa0..fb5fd60ad 100644
--- a/sys-cluster/nova/metadata.xml
+++ b/sys-cluster/nova/metadata.xml
@@ -11,13 +11,7 @@
(the main part of an IaaS system). It is written in Python.
</longdescription>
<use>
- <flag name="compute">Installs the initscripts for the nova volume
service</flag>
- <flag name="compute-only">only install stuff needed for a compute
host</flag>
<flag name="iscsi">Installs iscsi helper udev scripts</flag>
- <flag name="memcached">Installs the memcached server</flag>
- <flag name="novncproxy">Installs the initscripts for the nova novncproxy
service</flag>
- <flag name="openvswitch">Installs openvswitch for the neutron openvswitch
support</flag>
- <flag name="rabbitmq">Installs the rabbitmq server</flag>
</use>
<upstream>
<remote-id type="launchpad">nova</remote-id>
diff --git a/sys-cluster/nova/nova-25.0.0.ebuild
b/sys-cluster/nova/nova-25.0.0-r1.ebuild
similarity index 87%
rename from sys-cluster/nova/nova-25.0.0.ebuild
rename to sys-cluster/nova/nova-25.0.0-r1.ebuild
index 571b15f72..783b2b963 100644
--- a/sys-cluster/nova/nova-25.0.0.ebuild
+++ b/sys-cluster/nova/nova-25.0.0-r1.ebuild
@@ -18,9 +18,9 @@ SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz";
S="${WORKDIR}/${MYP}"
KEYWORDS="~amd64"
-LICENSE="Apache-2.0 iscsi? ( GPL-2 )"
+LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch
postgres +rabbitmq sqlite"
+IUSE="iscsi"
RDEPEND="
>=dev-python/pbr-5.8.0[${PYTHON_USEDEP}]
@@ -102,36 +102,12 @@ RDEPEND="
sys-fs/sysfsutils
sys-fs/multipath-tools
- compute? (
- app-cdr/cdrtools
- sys-fs/dosfstools
- app-emulation/qemu
- )
- compute-only? (
- >=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
- )
+ >=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
+
iscsi? (
sys-fs/lsscsi
>=sys-block/open-iscsi-2.0.873-r1
)
- memcached? (
- net-misc/memcached
- >=dev-python/python-memcached-1.58[${PYTHON_USEDEP}]
- )
- mysql? (
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
- )
- novncproxy? ( www-apps/novnc )
- openvswitch? ( net-misc/openvswitch )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.4.13[${PYTHON_USEDEP}]
- )
- rabbitmq? ( net-misc/rabbitmq-server )
- sqlite? (
- >=dev-python/sqlalchemy-1.4.13[sqlite,${PYTHON_USEDEP}]
- )
"
DEPEND="
${RDEPEND}
@@ -161,12 +137,6 @@ BDEPEND="
)
"
-REQUIRED_USE="
- !compute-only? ( || ( mysql postgres sqlite ) )
- compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
- test? ( mysql )
-"
-
distutils_enable_tests pytest
pkg_setup() {
@@ -234,20 +204,19 @@ python_install_all() {
insinto /etc/logrotate.d
newins "${FILESDIR}/nova.logrotate" nova.conf
- if use iscsi ; then
+ if use iscsi; then
# Install udev rules for handle iscsi disk with right links
under /dev
udev_newrules "${FILESDIR}/openstack-scsi-disk.rules"
60-openstack-scsi-disk.rules
- insinto /etc/nova/
+ exeinto "/usr/libexec/${PN}"
doins "${FILESDIR}/scsi-openscsi-link.sh"
fi
+
rm -r "${ED}/usr/etc" || die
}
pkg_postinst() {
tmpfiles_process nova.conf
- if use iscsi ; then
- elog "iscsid needs to be running if you want cinder to connect"
- fi
+ use iscsi && elog "iscsid needs to be running if you want cinder to
connect"
}
