From 5f35ea8eddc8bf849cced2ae100a1fe5440a0bfd Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 28 Mar 2022 01:41:33 +0900
Subject: [PATCH] Fix outdated default of [ldap] use(_auth)_pool

Since Newton release, Keystone enables connection pools for LDAP access
by default[1]. This change fixes the out-dated default.

[1] 22b114f64724a551df5d32075b6a2d93c394b0d3

Closes-Bug: #1966597
Change-Id: I29d7ba712f45a62ac64b915b2b3e0197cad9179b
---
 manifests/ldap.pp                                    | 8 ++++----
 releasenotes/notes/bug-1966597-1e6eb4f2911dbe23.yaml | 5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/bug-1966597-1e6eb4f2911dbe23.yaml

diff --git a/manifests/ldap.pp b/manifests/ldap.pp
index 22b842331..7cf8dc3e1 100644
--- a/manifests/ldap.pp
+++ b/manifests/ldap.pp
@@ -184,7 +184,7 @@
 #
 # [*use_pool*]
 #   Enable LDAP connection pooling. (boolean value)
-#   Defaults to false
+#   Defaults to true
 #
 # [*pool_size*]
 #   Connection pool size. (integer value)
@@ -209,7 +209,7 @@
 # [*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 false
+#   Defaults to true
 #
 # [*auth_pool_size*]
 #   End user auth connection pool size. (integer value)
@@ -288,13 +288,13 @@ class keystone::ldap(
   $identity_driver                      = undef,
   $assignment_driver                    = undef,
   $credential_driver                    = undef,
-  $use_pool                             = false,
+  $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                        = false,
+  $use_auth_pool                        = true,
   $auth_pool_size                       = 100,
   $auth_pool_connection_lifetime        = 60,
   $package_ensure                       = present,
diff --git a/releasenotes/notes/bug-1966597-1e6eb4f2911dbe23.yaml b/releasenotes/notes/bug-1966597-1e6eb4f2911dbe23.yaml
new file mode 100644
index 000000000..9adac3615
--- /dev/null
+++ b/releasenotes/notes/bug-1966597-1e6eb4f2911dbe23.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Now the ``keystone::ldap`` class enables connection pools for LDAP access
+    by default.