openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Disable keystone token_flush by default"

This commit is contained in:
Zuul 2019-09-20 23:56:51 +00:00 committed by Gerrit Code Review
parent 2a930a1a8f f907b0ec26
commit 5e1ef18516
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/profile/base/keystone.pp
View File

@ -70,7 +70,7 @@
#
# [*manage_db_purge*]
# (Optional) Whether keystone token flushing should be enabled
# Defaults to hiera('keystone_enable_db_purge', true)
# Defaults to hiera('keystone_enable_db_purge', false)
#
# [*public_endpoint_network*]
# (Optional) The network name where the admin endpoint is listening on.
@ -169,7 +169,7 @@ class tripleo::profile::base::keystone (
$heat_admin_user = undef,
$ldap_backends_config = undef,
$ldap_backend_enable = false,
$manage_db_purge = hiera('keystone_enable_db_purge', true),
$manage_db_purge = hiera('keystone_enable_db_purge', false),
$public_endpoint_network = hiera('keystone_public_api_network', undef),
$oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('oslo_messaging_rpc_node_names', undef)),

25
spec/classes/tripleo_profile_base_keystone_spec.rb
View File

@ -118,7 +118,7 @@ describe 'tripleo::profile::base::keystone' do
is_expected.to contain_class('keystone::security_compliance')
is_expected.to_not contain_class('keystone::ldap_backend')
is_expected.to_not contain_class('keystone::federation::openidc')
is_expected.to contain_class('keystone::cron::token_flush')
is_expected.to_not contain_class('keystone::cron::token_flush')
end
end
@ -144,16 +144,16 @@ describe 'tripleo::profile::base::keystone' do
is_expected.to contain_class('keystone::security_compliance')
is_expected.to_not contain_class('keystone::ldap_backend')
is_expected.to_not contain_class('keystone::federation::openidc')
is_expected.to contain_class('keystone::cron::token_flush')
is_expected.to_not contain_class('keystone::cron::token_flush')
end
end
context 'with step 4 and db_purge disabled' do
context 'with step less than 4 and db_purge enabled' do
before do
params.merge!(
{ :step => 4,
{ :step => 3,
:bootstrap_node => 'other.example.com',
:manage_db_purge => false
:manage_db_purge => true
}
)
end
@ -162,6 +162,21 @@ describe 'tripleo::profile::base::keystone' do
is_expected.to_not contain_class('keystone::cron::token_flush')
end
end
context 'with step 4 and db_purge enabled' do
before do
params.merge!(
{ :step => 4,
:bootstrap_node => 'other.example.com',
:manage_db_purge => true
}
)
end
it 'should trigger token_flush configuration' do
is_expected.to contain_class('keystone::cron::token_flush')
end
end
end
on_supported_os.each do |os, facts|