commit: a60be1ac093c87d9d710ac9ff09d59dd3424fa52 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Tue Mar 29 08:05:09 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Mar 29 08:44:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a60be1ac
sys-cluster/nova: delete hacking test generate conf and policy install bashcomp Closes: https://bugs.gentoo.org/836251 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> sys-cluster/nova/Manifest | 1 - ....0.0_rc1.ebuild => nova-25.0.0.0_rc1-r1.ebuild} | 26 +++++++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest index bcd14c85e..b87883dc5 100644 --- a/sys-cluster/nova/Manifest +++ b/sys-cluster/nova/Manifest @@ -1,2 +1 @@ DIST nova-25.0.0.0rc1.tar.gz 9446116 BLAKE2B e747588076c5bd35bab5cf3d3afca37523ee3e2643d9d18e50243ce8320c71151fabf87ef530dab180b871049cd55e5ee4dec6dc9e3d16a68d99b627870e4f93 SHA512 1c07fb6ce81efebd78a519cf6334f47d4dc08d6d949910f6c38b356f3457e2b2c4df6edb90d0760ac17740df0c0116a75eccf9ac85780757614fba110280d013 -DIST nova.conf.sample-25.0.0.0_rc1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970 diff --git a/sys-cluster/nova/nova-25.0.0.0_rc1.ebuild b/sys-cluster/nova/nova-25.0.0.0_rc1-r1.ebuild similarity index 93% rename from sys-cluster/nova/nova-25.0.0.0_rc1.ebuild rename to sys-cluster/nova/nova-25.0.0.0_rc1-r1.ebuild index b492cfa2a..e78562284 100644 --- a/sys-cluster/nova/nova-25.0.0.0_rc1.ebuild +++ b/sys-cluster/nova/nova-25.0.0.0_rc1-r1.ebuild @@ -3,11 +3,10 @@ EAPI=8 -EPYTEST_DESELECT=( nova/tests/unit/test_hacking.py ) MYP="${P//_/}" PYTHON_COMPAT=( python3_{8..9} ) -inherit distutils-r1 linux-info udev +inherit bash-completion-r1 distutils-r1 linux-info udev DESCRIPTION="Cloud computing fabric controller" HOMEPAGE=" @@ -15,14 +14,11 @@ HOMEPAGE=" https://opendev.org/openstack/nova https://pypi.org/project/nova/ " -SRC_URI=" - https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV} - https://tarballs.openstack.org/${PN}/${MYP}.tar.gz -" +SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz"; S="${WORKDIR}/${MYP}" KEYWORDS="~amd64" -LICENSE="Apache-2.0" +LICENSE="Apache-2.0 iscsi? ( GPL-2 )" SLOT="0" IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite" @@ -170,8 +166,6 @@ REQUIRED_USE=" compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) test? ( mysql ) " -#PATCHES=( -#) distutils_enable_tests pytest @@ -189,10 +183,16 @@ pkg_setup() { } python_prepare_all() { + rm nova/tests/unit/test_hacking.py || die sed -i '/^hacking/d' test-requirements.txt || die distutils-r1_python_prepare_all } +python_compile_all() { + oslo-config-generator --config-file=etc/nova/nova-config-generator.conf || die + oslopolicy-sample-generator --config-file=etc/nova/nova-policy-generator.conf || die +} + python_install_all() { distutils-r1_python_install_all @@ -210,9 +210,13 @@ python_install_all() { insinto /etc/nova insopts -m 0640 -o nova -g nova - newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" + + doins "nova.conf.sample" doins "${FILESDIR}/nova-compute.conf" + dodoc etc/nova/README*.txt + rm etc/nova/README*.txt || die doins "${S}/etc/nova/"* + doins policy.yaml # rootwrap filters insopts -m 0644 insinto /etc/nova/rootwrap.d @@ -223,6 +227,8 @@ python_install_all() { insopts -m 0600 -o root -g root doins "${FILESDIR}/nova-sudoers" + newbashcomp tools/nova-manage.bash_completion nova-manage + 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
