openstack/puppet-keystone
Code Issues Proposed changes

Remove cleanup of module plugin options

Browse Source 
These cleanups were added by [1] a while ago so we can assume the old
option has been purged during upgrade.

[1] 73f863e21c

Change-Id: I3b278c7969ca1764aeb4d0e0271d742ed3fea3b2
This commit is contained in:
Takashi Kajinami
2023-08-15 15:22:51 +09:00
parent 96422a2172
commit bd55eb81ba
6 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/federation/mellon.pp
View File

@@ -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){

3
manifests/federation/openidc.pp
View File

@@ -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 {

3
manifests/federation/shibboleth.pp
View File

@@ -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'] {

2
spec/classes/keystone_federation_mellon_spec.rb
View File

@@ -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

1
spec/classes/keystone_federation_openidc_spec.rb
View File

@@ -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({

4
spec/classes/keystone_federation_shibboleth_spec.rb
View File

@@ -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