openstack/puppet-keystone
Code Issues Proposed changes

identity provider: Drop reference to removed parameters

Browse Source 
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] b99810d6f9

Change-Id: I1adf1d04d575db8a1fbfdefc29700cf9ff27d254
This commit is contained in:
Takashi Kajinami
2024-03-05 16:58:49 +09:00
parent 26d0bf2218
commit 7f611fe32d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/federation/identity_provider.pp
View File

@@ -2,16 +2,6 @@
# #
# == Parameters # == 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*] # [*idp_entity_id*]
# (Required) Entity ID value for unique Identity Provider identification # (Required) Entity ID value for unique Identity Provider identification
# (string value). # (string value).
@@ -22,6 +12,16 @@
# [*idp_metadata_path*] # [*idp_metadata_path*]
# (Required) Path to the Identity Provider Metadata file (string value). # (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*] # [*idp_organization_name*]
# (Optional) Organization name the installation belongs to (string value). # (Optional) Organization name the installation belongs to (string value).
# Defaults to 'undef'. # Defaults to 'undef'.
@@ -82,8 +82,8 @@ class keystone::federation::identity_provider(
$idp_entity_id, $idp_entity_id,
$idp_sso_endpoint, $idp_sso_endpoint,
Stdlib::Absolutepath $idp_metadata_path, Stdlib::Absolutepath $idp_metadata_path,
$certfile = $::keystone::ssl_ca_certs, $certfile = $facts['os_service_default'],
$keyfile = $::keystone::ssl_ca_key, $keyfile = $facts['os_service_default'],
$user = $::keystone::params::user, $user = $::keystone::params::user,
$idp_organization_name = $facts['os_service_default'], $idp_organization_name = $facts['os_service_default'],
$idp_organization_display_name = $facts['os_service_default'], $idp_organization_display_name = $facts['os_service_default'],