From 2cc0bfdc74b4341beedaebd1bf8fe58a0f483b05 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Mon, 19 Feb 2024 21:52:09 +0900
Subject: [PATCH] federation: Ensure keyston::wsgi::apache is loaded

... otherwise the reference to keystone::wsgi::apache::priority fails.

Closes-Bug: #2054306
Change-Id: If33a0f50a071157314bbac820ce13dbd79bc9d3e
---
 manifests/federation/mellon.pp     | 4 ++++
 manifests/federation/openidc.pp    | 4 ++++
 manifests/federation/shibboleth.pp | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/manifests/federation/mellon.pp b/manifests/federation/mellon.pp
index f4c4f25aa..036c528a7 100644
--- a/manifests/federation/mellon.pp
+++ b/manifests/federation/mellon.pp
@@ -44,6 +44,10 @@ class keystone::federation::mellon (
   include keystone::deps
   include keystone::params
 
+  if ! defined(Class['keystone::wsgi::apache']) {
+    fail('The keystone::wsgi::apache class should be included in the catalog')
+  }
+
   # Note: if puppet-apache modify these values, this needs to be updated
   if $template_order <= 330 or $template_order >= 999 {
     fail('The template order should be greater than 330 and less than 999.')
diff --git a/manifests/federation/openidc.pp b/manifests/federation/openidc.pp
index f8636ec71..3fdf663c9 100644
--- a/manifests/federation/openidc.pp
+++ b/manifests/federation/openidc.pp
@@ -163,6 +163,10 @@ class keystone::federation::openidc (
   include keystone::deps
   include keystone::params
 
+  if ! defined(Class['keystone::wsgi::apache']) {
+    fail('The keystone::wsgi::apache class should be included in the catalog')
+  }
+
   if !($openidc_verify_method in ['introspection', 'jwks']) {
     fail('Unsupported token verification method.' +
         '  Must be one of "introspection" or "jwks"')
diff --git a/manifests/federation/shibboleth.pp b/manifests/federation/shibboleth.pp
index e92942e76..6a0b3cdce 100644
--- a/manifests/federation/shibboleth.pp
+++ b/manifests/federation/shibboleth.pp
@@ -53,6 +53,10 @@ class keystone::federation::shibboleth (
   include apache
   include keystone::deps
 
+  if ! defined(Class['keystone::wsgi::apache']) {
+    fail('The keystone::wsgi::apache class should be included in the catalog')
+  }
+
   # Note: if puppet-apache modify these values, this needs to be updated
   if $template_order <= 330 or $template_order >= 999 {
     fail('The template order should be greater than 330 and less than 999.')