openstack
/
puppet-keystone
Code Issues Proposed changes

Merge "Drop redundant default of revoke_by_id"

This commit is contained in:
Zuul 2024-05-04 08:25:55 +00:00 committed by Gerrit Code Review
parent 3765d2a94a 2f611f4b2e
commit ba4d5ad3c4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -43,7 +43,7 @@
# These enumerations are processed to determine the list of tokens to revoke.
# Only disable if you are switching to using the Revoke extension with a backend
# other than KVS, which stores events in memory.
# Defaults to true.
# Defaults to $facts['os_service_default']
#
# [*manage_service*]
# (Optional) If Puppet should manage service startup / shutdown.
@ -367,7 +367,7 @@ class keystone(
$password_hash_rounds = $facts['os_service_default'],
$max_password_length = $facts['os_service_default'],
$revoke_driver = $facts['os_service_default'],
$revoke_by_id = true,
$revoke_by_id = $facts['os_service_default'],
$public_endpoint = $facts['os_service_default'],
Boolean $manage_service = true,
Boolean $enabled = true,

4
spec/classes/keystone_init_spec.rb
View File

@ -38,7 +38,7 @@ describe 'keystone' do
is_expected.to contain_keystone_config('identity/max_password_length').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('revoke/driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('policy/driver').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('token/revoke_by_id').with_value(true)
is_expected.to contain_keystone_config('token/revoke_by_id').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__middleware('keystone_config').with(
:enable_proxy_headers_parsing => '<SERVICE DEFAULT>',
@ -404,7 +404,6 @@ describe 'keystone' do
{
'enable_fernet_setup' => true,
'fernet_max_active_keys' => 5,
'revoke_by_id' => false,
'fernet_key_repository' => '/etc/keystone/fernet-keys',
}
end
@ -423,7 +422,6 @@ describe 'keystone' do
:require => 'File[/etc/keystone/fernet-keys]',
) }
it { is_expected.to contain_keystone_config('fernet_tokens/max_active_keys').with_value(5)}
it { is_expected.to contain_keystone_config('token/revoke_by_id').with_value(false)}
end
context 'when overriding the fernet key directory' do