From a21eae468aa6b3e7e9e1bf06d2bc40e505af9c1f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 25 May 2023 17:07:04 +0900
Subject: [PATCH] CentOS: Install libvirt-daemon package for monolithic daemon

CentOS 9 Stream recently bumped libvirt version (from 9.0.0 to 9.3.0)
and the latest libvirt package no longer requires the daemon package
which provides the monolithic libvirt daemon[1]

[1] https://github.com/libvirt/libvirt/commit/5358618b1cd0afc126aed313249bf2134731665f

Backport note:
This fix is adjusted during backport, because the commit[2] which
added support for customizing package status is not present in
stable/zed and older branches.

[2] ec7b9f29b44ccd9dda5b379c11414f23dc6ae0d7

Change-Id: I612856bfd23f980b1e94815d3b5e15e0ea39f72e
(cherry picked from commit 5fe2ca84b0071980087534837dd571803e086486)
(cherry picked from commit d1bb160e40ad7e26dff2a33d10fe601349a5391f)
(cherry picked from commit b9720fd43a2f7f0609062e3fe2f35f5ebb3e99ce)
(cherry picked from commit 83f3820f9c5c6cc9d9202f96713d61f4910f26ba)
(cherry picked from commit eabbcd391ee1122db44ef27bb8ad1aa79da2d5dc)
---
 manifests/compute/libvirt/services.pp | 7 +++++++
 manifests/params.pp                   | 1 +
 2 files changed, 8 insertions(+)

diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp
index 8fe938c83..f883e72a9 100644
--- a/manifests/compute/libvirt/services.pp
+++ b/manifests/compute/libvirt/services.pp
@@ -144,6 +144,13 @@ class nova::compute::libvirt::services (
     -> Service<| title == 'libvirt' |>
     -> Service<| title == 'nova-compute'|>
 
+    if $facts['os']['family'] == 'RedHat' {
+      package { 'libvirt-daemon':
+        ensure => present,
+        name   => $::nova::params::libvirt_daemon_package_name,
+        tag    => ['openstack', 'nova-support-package'],
+      }
+    }
   } else {
     # NOTE(tkajinam): libvirt should be stopped before starting modular daemons
     Service<| title == 'libvirt' |> -> Service<| tag == 'libvirt-modular-service' |>
diff --git a/manifests/params.pp b/manifests/params.pp
index 785e770f9..8090daf22 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -20,6 +20,7 @@ class nova::params {
       $doc_package_name                  = 'openstack-nova-doc'
       $libvirt_package_name              = 'libvirt'
       $libvirt_guests_package_name       = 'libvirt-client'
+      $libvirt_daemon_package_name       = 'libvirt-daemon'
       $libvirt_daemon_package_prefix     = 'libvirt-daemon-'
       $libvirt_nwfilter_package_name     = 'libvirt-daemon-config-nwfilter'
       $scheduler_package_name            = 'openstack-nova-scheduler'