From 997172e80117b4a5873cb0c378f15dbadb183d7c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 9 Jan 2024 00:16:29 +0900
Subject: [PATCH] Avoid restarting dbus service

Restarting the dbus service is not necessary and is now triggering
a bug[1] in systemd-logind in CentOS Stream 9.

[1] https://issues.redhat.com/browse/RHEL-21004

Conflicts:
	manifests/compute/libvirt/services.pp

Change-Id: Iae47044d7a58ba6316ff5f4b5ffdc01b03eddeba
(cherry picked from commit 8d88b7bf4f6b31bfb665217d5f5c9c13f1a6e177)
(cherry picked from commit 63030d68373ed2ca9b37fb0831126cdd27921f3c)
(cherry picked from commit fb4e7883f8a1a6a6a929b0abecc0cfffdd538568)
---
 manifests/compute/libvirt/services.pp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/manifests/compute/libvirt/services.pp b/manifests/compute/libvirt/services.pp
index 64476a768..f2e54d9f5 100644
--- a/manifests/compute/libvirt/services.pp
+++ b/manifests/compute/libvirt/services.pp
@@ -115,11 +115,14 @@ class nova::compute::libvirt::services (
 
     # messagebus
     if($::osfamily == 'RedHat') {
+      # NOTE(tkajinam): Do not use libvirt-service tag to avoid unnecessary
+      # restart.
       service { 'messagebus':
-        ensure => running,
-        enable => true,
-        name   => $::nova::params::messagebus_service_name,
-        tag    => 'libvirt-service',
+        ensure  => running,
+        enable  => true,
+        name    => $::nova::params::messagebus_service_name,
+        require => Anchor['nova::service::begin'],
+        before  => Anchor['nova::service::end'],
       }
     }
   }