From 03a2ac709cebdf5401109a81f458ca5121b4cdee Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Tue, 5 Mar 2024 16:58:49 +0900
Subject: [PATCH] identity provider: Drop reference to removed parameters

The ssl parameters of the keystone class were already removed[1].

Also keystone defines its own defaults for certfile and keyfile so
these options are not actually required.

[1] b99810d6f9844d6cf5eac966672164c1db5bac6f

Change-Id: I1adf1d04d575db8a1fbfdefc29700cf9ff27d254
(cherry picked from commit 7f611fe32d24df9a7440be8a8d2e5928d0e05c91)
---
 manifests/federation/identity_provider.pp | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/manifests/federation/identity_provider.pp b/manifests/federation/identity_provider.pp
index 779ca0d56..bfa511708 100644
--- a/manifests/federation/identity_provider.pp
+++ b/manifests/federation/identity_provider.pp
@@ -2,16 +2,6 @@
 #
 # == Parameters
 #
-# [*certfile*]
-#   (Required) Path of the certfile for SAML signing. The path can not
-#   contain a comma. (string value).
-#   Defaults to $::keystone::ssl_ca_certs value.
-#
-# [*keyfile*]
-#   (Required) Path of the keyfile for SAML signing. The path can not
-#   contain a comma (string value).
-#   Defaults to $::keystone::ssl_ca_key value.
-#
 # [*idp_entity_id*]
 #   (Required) Entity ID value for unique Identity Provider identification
 #   (string value).
@@ -22,6 +12,16 @@
 # [*idp_metadata_path*]
 #   (Required) Path to the Identity Provider Metadata file (string value).
 #
+# [*certfile*]
+#   (Optional) Path of the certfile for SAML signing. The path can not
+#   contain a comma. (string value).
+#   Defaults to $facts['os_service_default'].
+#
+# [*keyfile*]
+#   (Optional) Path of the keyfile for SAML signing. The path can not
+#   contain a comma (string value).
+#   Defaults to $facts['os_service_default'].
+#
 # [*idp_organization_name*]
 #   (Optional) Organization name the installation belongs to (string value).
 #   Defaults to 'undef'.
@@ -82,8 +82,8 @@ class keystone::federation::identity_provider(
   $idp_entity_id,
   $idp_sso_endpoint,
   Stdlib::Absolutepath $idp_metadata_path,
-  $certfile                      = $::keystone::ssl_ca_certs,
-  $keyfile                       = $::keystone::ssl_ca_key,
+  $certfile                      = $facts['os_service_default'],
+  $keyfile                       = $facts['os_service_default'],
   $user                          = $::keystone::params::user,
   $idp_organization_name         = $facts['os_service_default'],
   $idp_organization_display_name = $facts['os_service_default'],