| 1 |
commit: a60be1ac093c87d9d710ac9ff09d59dd3424fa52 |
| 2 |
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Mar 29 08:05:09 2022 +0000 |
| 4 |
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Mar 29 08:44:51 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a60be1ac |
| 7 |
|
| 8 |
sys-cluster/nova: delete hacking test |
| 9 |
generate conf and policy |
| 10 |
install bashcomp |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/836251 |
| 13 |
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> |
| 14 |
|
| 15 |
sys-cluster/nova/Manifest | 1 - |
| 16 |
....0.0_rc1.ebuild => nova-25.0.0.0_rc1-r1.ebuild} | 26 +++++++++++++--------- |
| 17 |
2 files changed, 16 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest |
| 20 |
index bcd14c85e..b87883dc5 100644 |
| 21 |
--- a/sys-cluster/nova/Manifest |
| 22 |
+++ b/sys-cluster/nova/Manifest |
| 23 |
@@ -1,2 +1 @@ |
| 24 |
DIST nova-25.0.0.0rc1.tar.gz 9446116 BLAKE2B e747588076c5bd35bab5cf3d3afca37523ee3e2643d9d18e50243ce8320c71151fabf87ef530dab180b871049cd55e5ee4dec6dc9e3d16a68d99b627870e4f93 SHA512 1c07fb6ce81efebd78a519cf6334f47d4dc08d6d949910f6c38b356f3457e2b2c4df6edb90d0760ac17740df0c0116a75eccf9ac85780757614fba110280d013 |
| 25 |
-DIST nova.conf.sample-25.0.0.0_rc1 187107 BLAKE2B e577126b67f2cc1aa6597f89b1632007f726ad85875d5f27041d0f9ac88923b944fe7f45ae2b3332157713b5f93034dad4da2860917b025649a52d7d71986612 SHA512 4149f8f19a573e8717f521183ba330853742bb6731f0e9ef02842d3be1c188ea3a2cdbeb6043086869360b9b1174a17e221c4ad1f543f74220c46cf31b1ca970 |
| 26 |
|
| 27 |
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 |
| 28 |
similarity index 93% |
| 29 |
rename from sys-cluster/nova/nova-25.0.0.0_rc1.ebuild |
| 30 |
rename to sys-cluster/nova/nova-25.0.0.0_rc1-r1.ebuild |
| 31 |
index b492cfa2a..e78562284 100644 |
| 32 |
--- a/sys-cluster/nova/nova-25.0.0.0_rc1.ebuild |
| 33 |
+++ b/sys-cluster/nova/nova-25.0.0.0_rc1-r1.ebuild |
| 34 |
@@ -3,11 +3,10 @@ |
| 35 |
|
| 36 |
EAPI=8 |
| 37 |
|
| 38 |
-EPYTEST_DESELECT=( nova/tests/unit/test_hacking.py ) |
| 39 |
MYP="${P//_/}" |
| 40 |
PYTHON_COMPAT=( python3_{8..9} ) |
| 41 |
|
| 42 |
-inherit distutils-r1 linux-info udev |
| 43 |
+inherit bash-completion-r1 distutils-r1 linux-info udev |
| 44 |
|
| 45 |
DESCRIPTION="Cloud computing fabric controller" |
| 46 |
HOMEPAGE=" |
| 47 |
@@ -15,14 +14,11 @@ HOMEPAGE=" |
| 48 |
https://opendev.org/openstack/nova |
| 49 |
https://pypi.org/project/nova/ |
| 50 |
" |
| 51 |
-SRC_URI=" |
| 52 |
- https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-${PV} |
| 53 |
- https://tarballs.openstack.org/${PN}/${MYP}.tar.gz |
| 54 |
-" |
| 55 |
+SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz" |
| 56 |
S="${WORKDIR}/${MYP}" |
| 57 |
|
| 58 |
KEYWORDS="~amd64" |
| 59 |
-LICENSE="Apache-2.0" |
| 60 |
+LICENSE="Apache-2.0 iscsi? ( GPL-2 )" |
| 61 |
SLOT="0" |
| 62 |
IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite" |
| 63 |
|
| 64 |
@@ -170,8 +166,6 @@ REQUIRED_USE=" |
| 65 |
compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) |
| 66 |
test? ( mysql ) |
| 67 |
" |
| 68 |
-#PATCHES=( |
| 69 |
-#) |
| 70 |
|
| 71 |
distutils_enable_tests pytest |
| 72 |
|
| 73 |
@@ -189,10 +183,16 @@ pkg_setup() { |
| 74 |
} |
| 75 |
|
| 76 |
python_prepare_all() { |
| 77 |
+ rm nova/tests/unit/test_hacking.py || die |
| 78 |
sed -i '/^hacking/d' test-requirements.txt || die |
| 79 |
distutils-r1_python_prepare_all |
| 80 |
} |
| 81 |
|
| 82 |
+python_compile_all() { |
| 83 |
+ oslo-config-generator --config-file=etc/nova/nova-config-generator.conf || die |
| 84 |
+ oslopolicy-sample-generator --config-file=etc/nova/nova-policy-generator.conf || die |
| 85 |
+} |
| 86 |
+ |
| 87 |
python_install_all() { |
| 88 |
distutils-r1_python_install_all |
| 89 |
|
| 90 |
@@ -210,9 +210,13 @@ python_install_all() { |
| 91 |
|
| 92 |
insinto /etc/nova |
| 93 |
insopts -m 0640 -o nova -g nova |
| 94 |
- newins "${DISTDIR}/nova.conf.sample-${PV}" "nova.conf.sample" |
| 95 |
+ |
| 96 |
+ doins "nova.conf.sample" |
| 97 |
doins "${FILESDIR}/nova-compute.conf" |
| 98 |
+ dodoc etc/nova/README*.txt |
| 99 |
+ rm etc/nova/README*.txt || die |
| 100 |
doins "${S}/etc/nova/"* |
| 101 |
+ doins policy.yaml |
| 102 |
# rootwrap filters |
| 103 |
insopts -m 0644 |
| 104 |
insinto /etc/nova/rootwrap.d |
| 105 |
@@ -223,6 +227,8 @@ python_install_all() { |
| 106 |
insopts -m 0600 -o root -g root |
| 107 |
doins "${FILESDIR}/nova-sudoers" |
| 108 |
|
| 109 |
+ newbashcomp tools/nova-manage.bash_completion nova-manage |
| 110 |
+ |
| 111 |
if use iscsi ; then |
| 112 |
# Install udev rules for handle iscsi disk with right links under /dev |
| 113 |
udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules |
Archives