From 26e0525c2a7040e61589df784485c48914d100d7 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 10 Feb 2023 19:07:24 +0900 Subject: [PATCH] OIDC: Make sure the dependent auth modules are loaded The following two modules are required to use auth_openidc. - authn_core - authz_user This ensures these modules are loaded. Closes-Bug: #2006924 Change-Id: I13c36b10d80e9518d1d4af44c0b8a69fcfe911d3 (cherry picked from commit 6c52159c7b68c0da839cfb92e78876fff41afefc) (cherry picked from commit 6e56955c888603b5cc2091c50da1dddedc79fccc) --- manifests/federation/openidc.pp | 3 +++ spec/classes/keystone_federation_openidc_spec.rb | 2 ++ 2 files changed, 5 insertions(+) diff --git a/manifests/federation/openidc.pp b/manifests/federation/openidc.pp index 87ac32bff..2b9e735d2 100644 --- a/manifests/federation/openidc.pp +++ b/manifests/federation/openidc.pp @@ -164,6 +164,9 @@ class keystone::federation::openidc ( ) { include apache + include apache::mod::authn_core + include apache::mod::authz_user + include keystone::deps include keystone::params diff --git a/spec/classes/keystone_federation_openidc_spec.rb b/spec/classes/keystone_federation_openidc_spec.rb index ee1260d5d..d7e9d5d2d 100644 --- a/spec/classes/keystone_federation_openidc_spec.rb +++ b/spec/classes/keystone_federation_openidc_spec.rb @@ -72,6 +72,8 @@ describe 'keystone::federation::openidc' do end it { is_expected.to contain_package(platform_parameters[:openidc_package_name]) } + it { is_expected.to contain_class('apache::mod::authn_core') } + it { is_expected.to contain_class('apache::mod::authz_user') } context 'with only required parameters' do it 'should have basic params for openidc in Keystone configuration' do