openstack/puppet-keystone
Code Issues Proposed changes

Merge "federation: Ensure keyston::wsgi::apache is loaded"

Browse Source
This commit is contained in:
Zuul 2024-02-24 17:56:20 +00:00 committed by Gerrit Code Review
commit a94f767c0a
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/federation/mellon.pp
View File

@ -44,6 +44,10 @@ class keystone::federation::mellon (
include keystone::deps include keystone::deps
include keystone::params 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 # Note: if puppet-apache modify these values, this needs to be updated
if $template_order <= 330 or $template_order >= 999 { if $template_order <= 330 or $template_order >= 999 {
fail('The template order should be greater than 330 and less than 999.') fail('The template order should be greater than 330 and less than 999.')

4
manifests/federation/openidc.pp
View File

@ -163,6 +163,10 @@ class keystone::federation::openidc (
include keystone::deps include keystone::deps
include keystone::params 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']) { if !($openidc_verify_method in ['introspection', 'jwks']) {
fail('Unsupported token verification method.' + fail('Unsupported token verification method.' +
' Must be one of "introspection" or "jwks"') ' Must be one of "introspection" or "jwks"')

4
manifests/federation/shibboleth.pp
View File

@ -53,6 +53,10 @@ class keystone::federation::shibboleth (
include apache include apache
include keystone::deps 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 # Note: if puppet-apache modify these values, this needs to be updated
if $template_order <= 330 or $template_order >= 999 { if $template_order <= 330 or $template_order >= 999 {
fail('The template order should be greater than 330 and less than 999.') fail('The template order should be greater than 330 and less than 999.')