openstack/puppet-keystone
Code Issues Proposed changes

ldap: Deprecate support for core driver options

Browse Source 
Recent keystone recommends using domain specific backend to use ldap
identity driver instead of replacing the common driver.

Also assignment driver and credential driver do not support anything
other than sql so these options are not needed to use ldap.

Change-Id: Ib2bd17ef7a39a6c0358ebf62ad2a57356f7d5c90
This commit is contained in:
Takashi Kajinami
2025-02-12 23:19:51 +09:00
parent 319b346e2d
commit 6259f69c9f
2 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
manifests/ldap.pp
View File

@@ -179,10 +179,6 @@
# Valid options for tls_req_cert are demand, never, and allow. (string value)
# Defaults to $facts['os_service_default']
#
# [*identity_driver*]
# Identity backend driver. (string value)
# Defaults to $facts['os_service_default']
#
# [*use_pool*]
# Enable LDAP connection pooling. (boolean value)
# Defaults to $facts['os_service_default']
@@ -220,14 +216,6 @@
# End user auth connection lifetime in seconds. (integer value)
# Defaults to $facts['os_service_default']
#
# [*credential_driver*]
# Credential backend driver. (string value)
# Defaults to $facts['os_service_default']
#
# [*assignment_driver*]
# Assignment backend driver. (string value)
# Defaults to $facts['os_service_default']
#
# [*package_ensure*]
# (optional) Desired ensure state of packages.
# accepts latest or specific versions.
@@ -238,6 +226,20 @@
# LDAP support packages.
# 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
#
# Dan Bode dan@puppetlabs.com
@@ -287,9 +289,6 @@ class keystone::ldap(
= $facts['os_service_default'],
$tls_cacertfile = $facts['os_service_default'],
$tls_req_cert = $facts['os_service_default'],
$identity_driver = $facts['os_service_default'],
$assignment_driver = $facts['os_service_default'],
$credential_driver = $facts['os_service_default'],
$use_pool = $facts['os_service_default'],
$pool_size = $facts['os_service_default'],
$pool_retry_max = $facts['os_service_default'],
@@ -301,10 +300,20 @@ class keystone::ldap(
$auth_pool_connection_lifetime = $facts['os_service_default'],
$package_ensure = present,
Boolean $manage_packages = true,
# DEPRECATED PARAMETERS
$identity_driver = undef,
$assignment_driver = undef,
$credential_driver = undef,
) inherits keystone::params {
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 {
ensure_resource('package', 'python-ldappool', {
ensure => $package_ensure,
@@ -367,8 +376,8 @@ class keystone::ldap(
'ldap/use_auth_pool': value => $use_auth_pool;
'ldap/auth_pool_size': value => $auth_pool_size;
'ldap/auth_pool_connection_lifetime': value => $auth_pool_connection_lifetime;
'identity/driver': value => $identity_driver;
'credential/driver': value => $credential_driver;
'assignment/driver': value => $assignment_driver;
'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']);
}
}

9
releasenotes/notes/ldap-deprecate-driver-opts-9f3c370b3bfe7e8e.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
deprecations:
- |
The following parameters of the ``keystone::ldap`` class have been
deprecated and will be removed in a future release.
- ``identity_driver``
- ``assignment_driver``
- ``credential_driver``