diff --git a/manifests/federation/mellon.pp b/manifests/federation/mellon.pp index 36b1efd19..3c3c22a90 100644 --- a/manifests/federation/mellon.pp +++ b/manifests/federation/mellon.pp @@ -59,8 +59,7 @@ Apache + Mellon SP setups, where a REMOTE_USER env variable is always set, even } keystone_config { - 'auth/methods': value => join(any2array($methods),','); - 'auth/saml2': ensure => absent; + 'auth/methods': value => join(any2array($methods),','); } if($enable_websso){ diff --git a/manifests/federation/openidc.pp b/manifests/federation/openidc.pp index fe8fb2f85..6435fa22e 100644 --- a/manifests/federation/openidc.pp +++ b/manifests/federation/openidc.pp @@ -212,8 +212,7 @@ class keystone::federation::openidc ( } keystone_config { - 'auth/methods': value => join(any2array($methods),','); - 'auth/openid': ensure => absent; + 'auth/methods': value => join(any2array($methods),','); } if $remote_id_attribute { diff --git a/manifests/federation/shibboleth.pp b/manifests/federation/shibboleth.pp index 1a86203ba..ad79b611c 100644 --- a/manifests/federation/shibboleth.pp +++ b/manifests/federation/shibboleth.pp @@ -68,8 +68,7 @@ Apache + Shibboleth SP setups, where a REMOTE_USER env variable is always set, e } keystone_config { - 'auth/methods': value => join(any2array($methods),','); - 'auth/saml2': ensure => absent; + 'auth/methods': value => join(any2array($methods),','); } case $facts['os']['family'] { diff --git a/spec/classes/keystone_federation_mellon_spec.rb b/spec/classes/keystone_federation_mellon_spec.rb index 01514b19e..c033781ce 100644 --- a/spec/classes/keystone_federation_mellon_spec.rb +++ b/spec/classes/keystone_federation_mellon_spec.rb @@ -48,7 +48,6 @@ describe 'keystone::federation::mellon' do it 'should have basic params for mellon in Keystone configuration' do is_expected.to contain_keystone_config('auth/methods').with_value('password, token, saml2') - is_expected.to contain_keystone_config('auth/saml2').with_ensure('absent') end it { is_expected.to contain_concat__fragment('configure_mellon_keystone').with({ @@ -67,7 +66,6 @@ describe 'keystone::federation::mellon' do it 'should have basic params for mellon in Keystone configuration' do is_expected.to contain_keystone_config('auth/methods').with_value('password, token, saml2') - is_expected.to contain_keystone_config('auth/saml2').with_ensure('absent') end it 'should have parameters for websso in Keystone configuration' do diff --git a/spec/classes/keystone_federation_openidc_spec.rb b/spec/classes/keystone_federation_openidc_spec.rb index 14c3e01c5..f73765bb7 100644 --- a/spec/classes/keystone_federation_openidc_spec.rb +++ b/spec/classes/keystone_federation_openidc_spec.rb @@ -63,7 +63,6 @@ describe 'keystone::federation::openidc' do context 'with only required parameters' do it 'should have basic params for openidc in Keystone configuration' do is_expected.to contain_keystone_config('auth/methods').with_value('password, token, openid') - is_expected.to contain_keystone_config('auth/openid').with_ensure('absent') end it { is_expected.to contain_concat__fragment('configure_openidc_keystone').with({ diff --git a/spec/classes/keystone_federation_shibboleth_spec.rb b/spec/classes/keystone_federation_shibboleth_spec.rb index c87d9322b..592d82557 100644 --- a/spec/classes/keystone_federation_shibboleth_spec.rb +++ b/spec/classes/keystone_federation_shibboleth_spec.rb @@ -52,7 +52,6 @@ describe 'keystone::federation::shibboleth' do let (:params) { default_params } it 'should have basic params for shibboleth in Keystone configuration' do is_expected.to contain_keystone_config('auth/methods').with_value('password, token, saml2') - is_expected.to contain_keystone_config('auth/saml2').with_ensure('absent') end end @@ -83,7 +82,6 @@ describe 'keystone::federation::shibboleth' do it { is_expected.to contain_apache__mod('shib2') } it { is_expected.to contain_keystone_config('auth/methods').with_value('password, token, saml2') } - it { is_expected.to contain_keystone_config('auth/saml2').with_ensure('absent') } it { is_expected.to contain_concat__fragment('configure_shibboleth_keystone').with({ :target => "10-keystone_wsgi.conf", :order => params[:template_order], @@ -107,7 +105,6 @@ describe 'keystone::federation::shibboleth' do it { is_expected.to contain_apache__mod('shib2') } it { is_expected.to contain_keystone_config('auth/methods').with_value('password, token, saml2') } - it { is_expected.to contain_keystone_config('auth/saml2').with_ensure('absent') } it { is_expected.to contain_concat__fragment('configure_shibboleth_keystone').with({ :target => "10-keystone_wsgi.conf", :order => params[:template_order], @@ -120,7 +117,6 @@ describe 'keystone::federation::shibboleth' do let (:params) { default_params } it { is_expected.to_not contain_apache__mod('shib2') } it { is_expected.to contain_keystone_config('auth/methods').with_value('password, token, saml2') } - it { is_expected.to contain_keystone_config('auth/saml2').with_ensure('absent') } it { is_expected.to_not contain_concat__fragment('configure_shibboleth_keystone') } end end