federation: Ensure keyston::wsgi::apache is loaded
... otherwise the reference to keystone::wsgi::apache::priority fails. Closes-Bug: #2054306 Change-Id: If33a0f50a071157314bbac820ce13dbd79bc9d3e
This commit is contained in:
		@@ -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.')
 | 
			
		||||
 
 | 
			
		||||
@@ -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"')
 | 
			
		||||
 
 | 
			
		||||
@@ -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.')
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user