openstack/puppet-keystone
Code Issues Proposed changes

ldap: Remove deprecated core driver options

Browse Source 
These were deprecated during 2025.1 cycle[1].

[1] 6259f69c9f

Change-Id: Iff93ee25592f4953b4d9823d316c51bcde60727b
This commit is contained in:
Takashi Kajinami
2025-04-17 23:47:25 +09:00
parent 12a3303211
commit 5f7f11669b
3 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
manifests/ldap.pp
View File

@@ -226,20 +226,6 @@
# LDAP support packages. # LDAP support packages.
# Defaults to true. # Defaults to true.
# #
# DEPRECATED PARAMETERS
#
# [*identity_driver*]
# Identity backend driver. (string value)
# Defaults to undef
#
# [*credential_driver*]
# Credential backend driver. (string value)
# Defaults to undef
#
# [*assignment_driver*]
# Assignment backend driver. (string value)
# Defaults to undef
#
# == Authors # == Authors
# #
# Dan Bode dan@puppetlabs.com # Dan Bode dan@puppetlabs.com
@@ -300,20 +286,10 @@ class keystone::ldap(
$auth_pool_connection_lifetime = $facts['os_service_default'], $auth_pool_connection_lifetime = $facts['os_service_default'],
$package_ensure = present, $package_ensure = present,
Boolean $manage_packages = true, Boolean $manage_packages = true,
# DEPRECATED PARAMETERS
$identity_driver = undef,
$assignment_driver = undef,
$credential_driver = undef,
) inherits keystone::params { ) inherits keystone::params {
include keystone::deps include keystone::deps
['identity_driver', 'assignment_driver', 'credential_driver'].each |String $driver_opt| {
if getvar($driver_opt) != undef {
warning("The ${driver_opt} parameter is deprecated and will be removed.")
}
}
if $manage_packages { if $manage_packages {
ensure_resource('package', 'python-ldappool', { ensure_resource('package', 'python-ldappool', {
ensure => $package_ensure, ensure => $package_ensure,
@@ -376,8 +352,5 @@ class keystone::ldap(
'ldap/use_auth_pool': value => $use_auth_pool; 'ldap/use_auth_pool': value => $use_auth_pool;
'ldap/auth_pool_size': value => $auth_pool_size; 'ldap/auth_pool_size': value => $auth_pool_size;
'ldap/auth_pool_connection_lifetime': value => $auth_pool_connection_lifetime; 'ldap/auth_pool_connection_lifetime': value => $auth_pool_connection_lifetime;
'identity/driver': value => pick($identity_driver, $::facts['os_service_default']);
'credential/driver': value => pick($credential_driver, $::facts['os_service_default']);
'assignment/driver': value => pick($assignment_driver, $::facts['os_service_default']);
} }
} }

8
releasenotes/notes/ldap-remove-driver-opts-d3810ceb0c6fc51e.yaml Normal file
View File

@@ -0,0 +1,8 @@
---
upgrade:
- |
The following parameters of the ``keystone::ldap`` class have been removed.
- ``identity_driver``
- ``assignment_driver``
- ``credential_driver``

5
spec/classes/keystone_ldap_spec.rb
View File

@@ -76,8 +76,6 @@ describe 'keystone::ldap' do
is_expected.to contain_keystone_config('ldap/auth_pool_size').with_value('<SERVICE DEFAULT>') is_expected.to contain_keystone_config('ldap/auth_pool_size').with_value('<SERVICE DEFAULT>')
is_expected.to contain_keystone_config('ldap/auth_pool_connection_lifetime').with_value('<SERVICE DEFAULT>') is_expected.to contain_keystone_config('ldap/auth_pool_connection_lifetime').with_value('<SERVICE DEFAULT>')
} }
it { is_expected.to contain_keystone_config('identity/driver').with_value('<SERVICE DEFAULT>') }
end end
context 'with parameters' do context 'with parameters' do
@@ -121,7 +119,6 @@ describe 'keystone::ldap' do
:tls_cacertdir => '/etc/ssl/certs/', :tls_cacertdir => '/etc/ssl/certs/',
:tls_cacertfile => '/etc/ssl/certs/ca-certificates.crt', :tls_cacertfile => '/etc/ssl/certs/ca-certificates.crt',
:tls_req_cert => 'demand', :tls_req_cert => 'demand',
:identity_driver => 'ldap',
:use_pool => true, :use_pool => true,
:pool_size => 10, :pool_size => 10,
:pool_retry_max => 3, :pool_retry_max => 3,
@@ -214,8 +211,6 @@ describe 'keystone::ldap' do
is_expected.to contain_keystone_config('ldap/auth_pool_size').with_value(100) 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) 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') }
end end
context 'with manage_packages set to false' do context 'with manage_packages set to false' do