From eec7bf48919adefb02c30af3e089ba4f6b96a298 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 12 Dec 2023 10:28:41 +0900
Subject: [PATCH] Debian: Allow keystone without httpd

Debian provides the keystone service using uwsgi, which does not
require httpd.

Change-Id: I7897f4681b95cd047fa5f6d20a9a78c9a5879783
(cherry picked from commit b634ad3eeade762e2e1bb2b8441c179efdb2faaf)
(cherry picked from commit cf6b06dba274ca0a00f7eb353e2da57f0b6273ce)
---
 manifests/init.pp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index d2fc4ffc4..be5871562 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -419,12 +419,13 @@ class keystone(
 
   if $manage_policyrcd {
     # openstacklib policy_rcd only affects debian based systems.
-    Policy_rcd <| title == 'keystone' |> -> Package['keystone']
-    Policy_rcd['apache2'] -> Package['httpd']
     if ($facts['os']['name'] == 'Ubuntu') {
       $policy_services = 'apache2'
+      Policy_rcd['apache2'] -> Package['httpd']
     } else {
       $policy_services = ['keystone', 'apache2']
+      Policy_rcd['keystone'] -> Package['keystone']
+      Policy_rcd['apache2'] -> Package<| title == 'httpd' |>
     }
     ensure_resource('policy_rcd', $policy_services, { ensure => present, 'set_code' => '101' })
   }