openstack
/
puppet-keystone
Code Issues Proposed changes

keystone::ldap: Remove redundant defaults 

These default values are same as the service default values defined in
keystone.

Change-Id: I45bdf200f179aa4094c7c37c2cfdd8f559c0eb1f
This commit is contained in:
Takashi Kajinami 2022-03-28 01:26:21 +09:00
parent 03c52c3b51
commit 2473f3441e
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/ldap.pp
View File

@ -185,40 +185,40 @@
#
# [*use_pool*]
# Enable LDAP connection pooling. (boolean value)
# Defaults to true
# Defaults to $::os_service_default
#
# [*pool_size*]
# Connection pool size. (integer value)
# Defaults to '10'
# Defaults to $::os_service_default
#
# [*pool_retry_max*]
# Maximum count of reconnect trials. (integer value)
# Defaults to '3'
# Defaults to $::os_service_default
#
# [*pool_retry_delay*]
# Time span in seconds to wait between two reconnect trials. (floating point value)
# Defaults to '0.1'
# Defaults to $::os_service_default
#
# [*pool_connection_timeout*]
# Connector timeout in seconds. Value -1 indicates indefinite wait for response. (integer value)
# Defaults to '-1'
# Defaults to $::os_service_default
#
# [*pool_connection_lifetime*]
# Connection lifetime in seconds. (integer value)
# Defaults to '600'
# Defaults to $::os_service_default
#
# [*use_auth_pool*]
# Enable LDAP connection pooling for end user authentication.
# If use_pool is disabled, then this setting is meaningless and is not used at all. (boolean value)
# Defaults to true
# Defaults to $::os_service_default
#
# [*auth_pool_size*]
# End user auth connection pool size. (integer value)
# Defaults to '100'
# Defaults to $::os_service_default
#
# [*auth_pool_connection_lifetime*]
# End user auth connection lifetime in seconds. (integer value)
# Defaults to '60'
# Defaults to $::os_service_default
#
# [*credential_driver*]
# Credential backend driver. (string value)
@ -289,15 +289,15 @@ class keystone::ldap(
$identity_driver = $::os_service_default,
$assignment_driver = $::os_service_default,
$credential_driver = $::os_service_default,
$use_pool = true,
$pool_size = 10,
$pool_retry_max = 3,
$pool_retry_delay = 0.1,
$pool_connection_timeout = -1,
$pool_connection_lifetime = 600,
$use_auth_pool = true,
$auth_pool_size = 100,
$auth_pool_connection_lifetime = 60,
$use_pool = $::os_service_default,
$pool_size = $::os_service_default,
$pool_retry_max = $::os_service_default,
$pool_retry_delay = $::os_service_default,
$pool_connection_timeout = $::os_service_default,
$pool_connection_lifetime = $::os_service_default,
$use_auth_pool = $::os_service_default,
$auth_pool_size = $::os_service_default,
$auth_pool_connection_lifetime = $::os_service_default,
$package_ensure = present,
$manage_packages = true,
) inherits keystone::params {

36
spec/classes/keystone_ldap_spec.rb
View File

@ -43,15 +43,15 @@ describe 'keystone::ldap' do
:tls_cacertfile => '/etc/ssl/certs/ca-certificates.crt',
:tls_req_cert => 'demand',
:identity_driver => 'ldap',
:use_pool => 'True',
:pool_size => 20,
:pool_retry_max => 2,
:pool_retry_delay => 0.2,
:pool_connection_timeout => 222,
:pool_connection_lifetime => 222,
:use_auth_pool => 'True',
:auth_pool_size => 20,
:auth_pool_connection_lifetime => 200,
:use_pool => true,
:pool_size => 10,
:pool_retry_max => 3,
:pool_retry_delay => 0.1,
:pool_connection_timeout => -1,
:pool_connection_lifetime => 600,
:use_auth_pool => true,
:auth_pool_size => 100,
:auth_pool_connection_lifetime => 60,
}
end
@ -115,15 +115,15 @@ describe 'keystone::ldap' do
}
it {
is_expected.to contain_keystone_config('ldap/use_pool').with_value('True')
is_expected.to contain_keystone_config('ldap/pool_size').with_value('20')
is_expected.to contain_keystone_config('ldap/pool_retry_max').with_value('2')
is_expected.to contain_keystone_config('ldap/pool_retry_delay').with_value('0.2')
is_expected.to contain_keystone_config('ldap/pool_connection_timeout').with_value('222')
is_expected.to contain_keystone_config('ldap/pool_connection_lifetime').with_value('222')
is_expected.to contain_keystone_config('ldap/use_auth_pool').with_value('True')
is_expected.to contain_keystone_config('ldap/auth_pool_size').with_value('20')
is_expected.to contain_keystone_config('ldap/auth_pool_connection_lifetime').with_value('200')
is_expected.to contain_keystone_config('ldap/use_pool').with_value(true)
is_expected.to contain_keystone_config('ldap/pool_size').with_value('10')
is_expected.to contain_keystone_config('ldap/pool_retry_max').with_value(3)
is_expected.to contain_keystone_config('ldap/pool_retry_delay').with_value(0.1)
is_expected.to contain_keystone_config('ldap/pool_connection_timeout').with_value(-1)
is_expected.to contain_keystone_config('ldap/pool_connection_lifetime').with_value(600)
is_expected.to contain_keystone_config('ldap/use_auth_pool').with_value(true)
is_expected.to contain_keystone_config('ldap/auth_pool_size').with_value(100)
is_expected.to contain_keystone_config('ldap/auth_pool_connection_lifetime').with_value(60)
}
it { is_expected.to contain_keystone_config('identity/driver').with_value('ldap') }