From 5f7f11669baa343f7d9ccffe1d1a3f04d4fd331c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Thu, 17 Apr 2025 23:47:25 +0900
Subject: [PATCH] ldap: Remove deprecated core driver options

These were deprecated during 2025.1 cycle[1].

[1] 6259f69c9fe0f61057e7b56f90c880c9fe150c4c

Change-Id: Iff93ee25592f4953b4d9823d316c51bcde60727b
---
 manifests/ldap.pp                             | 27 -------------------
 ...p-remove-driver-opts-d3810ceb0c6fc51e.yaml |  8 ++++++
 spec/classes/keystone_ldap_spec.rb            |  5 ----
 3 files changed, 8 insertions(+), 32 deletions(-)
 create mode 100644 releasenotes/notes/ldap-remove-driver-opts-d3810ceb0c6fc51e.yaml

diff --git a/manifests/ldap.pp b/manifests/ldap.pp
index 43b012ed1..75dc72bc5 100644
--- a/manifests/ldap.pp
+++ b/manifests/ldap.pp
@@ -226,20 +226,6 @@
 #   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
@@ -300,20 +286,10 @@ 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,
@@ -376,8 +352,5 @@ 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 => 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']);
   }
 }
diff --git a/releasenotes/notes/ldap-remove-driver-opts-d3810ceb0c6fc51e.yaml b/releasenotes/notes/ldap-remove-driver-opts-d3810ceb0c6fc51e.yaml
new file mode 100644
index 000000000..4a4ce652c
--- /dev/null
+++ b/releasenotes/notes/ldap-remove-driver-opts-d3810ceb0c6fc51e.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``keystone::ldap`` class have been removed.
+
+    - ``identity_driver``
+    - ``assignment_driver``
+    - ``credential_driver``
diff --git a/spec/classes/keystone_ldap_spec.rb b/spec/classes/keystone_ldap_spec.rb
index 64f040367..5b893a571 100644
--- a/spec/classes/keystone_ldap_spec.rb
+++ b/spec/classes/keystone_ldap_spec.rb
@@ -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_connection_lifetime').with_value('<SERVICE DEFAULT>')
       }
-
-      it { is_expected.to contain_keystone_config('identity/driver').with_value('<SERVICE DEFAULT>') }
     end
 
     context 'with parameters' do
@@ -121,7 +119,6 @@ describe 'keystone::ldap' do
           :tls_cacertdir                        => '/etc/ssl/certs/',
           :tls_cacertfile                       => '/etc/ssl/certs/ca-certificates.crt',
           :tls_req_cert                         => 'demand',
-          :identity_driver                      => 'ldap',
           :use_pool                             => true,
           :pool_size                            => 10,
           :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_connection_lifetime').with_value(60)
       }
-
-      it { is_expected.to contain_keystone_config('identity/driver').with_value('ldap') }
     end
 
     context 'with manage_packages set to false' do