Add pool configuration parameters for keystone with ldap
PROD-24714
Change-Id: Iaec98631981ce55ff05eb2ea351f1726578819e0
diff --git a/keystone/files/_ldap.conf b/keystone/files/_ldap.conf
index f816eff..be137a2 100644
--- a/keystone/files/_ldap.conf
+++ b/keystone/files/_ldap.conf
@@ -123,3 +123,34 @@
{%- endif %}
{%- endif %}
+
+{%- if ldap.connection_timeout is defined %}
+connection_timeout = {{ ldap.connection_timeout }}
+{%- endif %}
+{%- if ldap.use_pool is defined %}
+use_pool = {{ ldap.use_pool }}
+{%- endif %}
+{%- if ldap.pool_size is defined %}
+pool_size = {{ ldap.pool_size }}
+{%- endif %}
+{%- if ldap.pool_retry_max is defined %}
+pool_retry_max = {{ ldap.pool_retry_max }}
+{%- endif %}
+{%- if ldap.pool_retry_delay is defined %}
+pool_retry_delay = {{ ldap.pool_retry_delay }}
+{%- endif %}
+{%- if ldap.pool_connection_timeout is defined %}
+pool_connection_timeout = {{ ldap.pool_connection_timeout }}
+{%- endif %}
+{%- if ldap.pool_connection_lifetime is defined %}
+pool_connection_lifetime = {{ ldap.pool_connection_lifetime }}
+{%- endif %}
+{%- if ldap.use_auth_pool is defined %}
+use_auth_pool = {{ ldap.use_auth_pool }}
+{%- endif %}
+{%- if ldap.auth_pool_size is defined %}
+auth_pool_size = {{ ldap.auth_pool_size }}
+{%- endif %}
+{%- if ldap.auth_pool_connection_lifetime is defined %}
+auth_pool_connection_lifetime = {{ ldap.auth_pool_connection_lifetime }}
+{%- endif %}
diff --git a/keystone/files/pike/keystone.conf.Debian b/keystone/files/pike/keystone.conf.Debian
index 346471b..c44c569 100644
--- a/keystone/files/pike/keystone.conf.Debian
+++ b/keystone/files/pike/keystone.conf.Debian
@@ -1295,7 +1295,7 @@
# Reason: This option has been deprecated in the O release and will be removed
# in the P release. Use SQL backends instead.
#default_lock_timeout = 5
-{%- if server.get("backend", "sql") == "ldap" %}
+{%- if server.get("backend", "sql") == "ldap" and server.ldap is defined %}
{%- set ldap = server.ldap %}
{% include "keystone/files/_ldap.conf" %}
{%- endif %}
diff --git a/keystone/files/queens/keystone.conf.Debian b/keystone/files/queens/keystone.conf.Debian
index bcc4ce9..3cafb64 100644
--- a/keystone/files/queens/keystone.conf.Debian
+++ b/keystone/files/queens/keystone.conf.Debian
@@ -756,6 +756,10 @@
# value)
#backward_compatible_ids = true
+{%- if server.get("backend", "sql") == "ldap" and server.ldap is defined %}
+{%- set ldap = server.ldap %}
+{% include "keystone/files/_ldap.conf" %}
+{%- endif %}
[ldap]
diff --git a/keystone/files/rocky/keystone.conf.Debian b/keystone/files/rocky/keystone.conf.Debian
index 9b00199..706bd77 100644
--- a/keystone/files/rocky/keystone.conf.Debian
+++ b/keystone/files/rocky/keystone.conf.Debian
@@ -720,6 +720,10 @@
# recommended value. (boolean value)
#backward_compatible_ids = true
+{%- if server.get("backend", "sql") == "ldap" and server.ldap is defined %}
+{%- set ldap = server.ldap %}
+{% include "keystone/files/_ldap.conf" %}
+{%- endif %}
[ldap]