From 58a780c887220fe5d9fa1eda39a909e9c4d35a34 Mon Sep 17 00:00:00 2001
From: Alessandro Barbieri <lssndrbarbieri@gmail.com>
Date: Tue, 5 Apr 2022 12:33:41 +0200
Subject: [PATCH] sys-cluster/nova: process_tmpfiles

Closes: https://bugs.gentoo.org/836807
Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
---
 sys-cluster/nova/Manifest                    |   1 -
 sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild | 251 -------------------
 sys-cluster/nova/nova-25.0.0.ebuild          |   2 +
 3 files changed, 2 insertions(+), 252 deletions(-)
 delete mode 100644 sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild

diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index 189a69fa60..59323a2ad5 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-25.0.0.tar.gz 9445471 BLAKE2B 5584daee1026ebec9437368b5c39ded4c474d1a15291487f9e9ee72593626a3ce2204ec8bf5acb7d579328a7b7aed57174d42db3cabca1c8e93047e49e0bc847 SHA512 c4a1423dcb97bcc96bb5faccd43f58e17293172121a2715ff13c05690c5b8868befeb45815a9dca33fa5bc387fd8c586f68984b0c931427aa02794a1d2a5179e
diff --git a/sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild b/sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild
deleted file mode 100644
index 3ae0f19aaa..0000000000
--- a/sys-cluster/nova/nova-25.0.0.0_rc1-r3.ebuild
+++ /dev/null
@@ -1,251 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MYP="${P//_/}"
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit bash-completion-r1 distutils-r1 linux-info systemd tmpfiles udev
-
-DESCRIPTION="Cloud computing fabric controller"
-HOMEPAGE="
-	https://launchpad.net/nova
-	https://opendev.org/openstack/nova
-	https://pypi.org/project/nova/
-"
-SRC_URI="https://tarballs.openstack.org/${PN}/${MYP}.tar.gz"
-S="${WORKDIR}/${MYP}"
-
-KEYWORDS="~amd64"
-LICENSE="Apache-2.0 iscsi? ( GPL-2 )"
-SLOT="0"
-IUSE="+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
-
-RDEPEND="
-	>=dev-python/pbr-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-4.1.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.30.1[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.20.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.7[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.8.2[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.15[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/sqlalchemy-migrate-0.13.0[${PYTHON_USEDEP}]
-	>=dev-python/alembic-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.7.1[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/python-cinderclient-3.3.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/python-neutronclient-7.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.25.1[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/websockify-0.9.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-4.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-8.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-4.6.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-1.18.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-upgradecheck-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-4.12.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-10.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-10.3.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-2.6.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.35.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-5.2[${PYTHON_USEDEP}]
-	>=dev-python/os-resource-classes-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/os-traits-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/os-vif-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.16.0[${PYTHON_USEDEP}]
-	>=dev-python/microversion-parse-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.58.0[${PYTHON_USEDEP}]
-	>=dev-python/cursive-0.2.1[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.3.3[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.7.0[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/futurist-1.8.0[${PYTHON_USEDEP}]
-	>=dev-python/openstacksdk-0.35.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-
-	>=dev-python/pypowervm-1.1.15[${PYTHON_USEDEP}]
-	>=dev-python/zVMCloudConnector-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/os-win-5.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}]
-
-	acct-user/nova
-	acct-group/nova
-	app-emulation/libvirt[iscsi?]
-	app-emulation/spice-html5
-	dev-python/libvirt-python[${PYTHON_USEDEP}]
-	dev-python/oslo-limit[${PYTHON_USEDEP}]
-	net-misc/bridge-utils
-	sys-apps/iproute2
-	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}]
-	)
-	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}
-	app-admin/sudo
-"
-BDEPEND="
-	test? (
-		>=dev-python/types-paramiko-0.1.3[${PYTHON_USEDEP}]
-		>=dev-python/ddt-1.2.1[${PYTHON_USEDEP}]
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-3.0.0[${PYTHON_USEDEP}]
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-		>=dev-python/pymysql-0.8.0[${PYTHON_USEDEP}]
-		>=dev-python/python-barbicanclient-4.5.2[${PYTHON_USEDEP}]
-		>=dev-python/python-ironicclient-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.8.0[${PYTHON_USEDEP}]
-		>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/testresources-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/gabbi-1.35.0[${PYTHON_USEDEP}]
-		>=dev-python/wsgi_intercept-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-vmware-3.6.0[${PYTHON_USEDEP}]
-
-		sys-cluster/placement[${PYTHON_USEDEP}]
-	)
-"
-
-REQUIRED_USE="
-	!compute-only? ( || ( mysql postgres sqlite ) )
-	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )
-	test? ( mysql )
-"
-
-distutils_enable_tests pytest
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
-	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
-	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
-	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
-		done
-	fi
-}
-
-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
-
-	for svc in api compute conductor consoleauth network novncproxy scheduler spicehtml5proxy xvpvncproxy; do
-		newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
-	done
-
-	for svc in api compute conductor metadata-api novncproxy os-compute-api scheduler; do
-		systemd_dounit "${FILESDIR}/openstack-nova-${svc}.service"
-	done
-
-	diropts -m 0750 -o nova -g qemu
-	dodir /var/log/nova /var/lib/nova/instances
-	diropts -m 0750 -o nova -g nova
-
-	insinto /etc/nova
-	insopts -m 0640 -o nova -g nova
-
-	doins etc/nova/nova.conf.sample
-	doins "${FILESDIR}/nova-compute.conf"
-	dodoc etc/nova/README*.txt
-	rm etc/nova/README*.txt || die
-	doins "${S}/etc/nova/"*
-	doins etc/nova/policy.yaml.sample
-	# rootwrap filters
-	insopts -m 0644
-	insinto /etc/nova/rootwrap.d
-	doins etc/nova/rootwrap.d/compute.filters
-
-	# add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0600 -o root -g root
-	doins "${FILESDIR}/nova-sudoers"
-
-	newbashcomp tools/nova-manage.bash_completion nova-manage
-
-	newtmpfiles "${FILESDIR}/nova.tmpfile" nova.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/nova.logrotate" nova.conf
-
-	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/
-		doins "${FILESDIR}/scsi-openscsi-link.sh"
-	fi
-	rm -r "${ED}/usr/etc" || die
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "iscsid needs to be running if you want cinder to connect"
-	fi
-}
diff --git a/sys-cluster/nova/nova-25.0.0.ebuild b/sys-cluster/nova/nova-25.0.0.ebuild
index 3ae0f19aaa..571b15f729 100644
--- a/sys-cluster/nova/nova-25.0.0.ebuild
+++ b/sys-cluster/nova/nova-25.0.0.ebuild
@@ -245,6 +245,8 @@ python_install_all() {
 }
 
 pkg_postinst() {
+	tmpfiles_process nova.conf
+
 	if use iscsi ; then
 		elog "iscsid needs to be running if you want cinder to connect"
 	fi