From eab0404ff3f55953d284395aad0db21ef08c6b6b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 13 Mar 2023 11:47:30 +0900
Subject: [PATCH] Expose executor_thread_pool_size

This option has been supported by puppet-oslo but has not been
configurable.

Change-Id: Iadb2308d8a7f6c32e01395ca17861b172217f3d6
---
 manifests/init.pp                               | 12 +++++++++---
 ...cutor_thread_pool_size-9da1d6c17a448e38.yaml |  4 ++++
 spec/classes/keystone_init_spec.rb              | 17 ++++++++++-------
 3 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/executor_thread_pool_size-9da1d6c17a448e38.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 909ff54e7..c97ad63f0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -166,6 +166,10 @@
 #   (Optional) Seconds to wait for a response from a call.
 #   Defaults to $facts['os_service_default']
 #
+# [*executor_thread_pool_size*]
+#   (Optional) Size of executor thread pool when executor is threading or eventlet.
+#   Defaults to $facts['os_service_default'].
+#
 # [*public_endpoint*]
 #   (Optional) The base public endpoint URL for keystone that are
 #   advertised to clients (NOTE: this does NOT affect how
@@ -366,6 +370,7 @@ class keystone(
   $notification_format                  = $facts['os_service_default'],
   $notification_opt_out                 = $facts['os_service_default'],
   $control_exchange                     = $facts['os_service_default'],
+  $executor_thread_pool_size            = $facts['os_service_default'],
   $rpc_response_timeout                 = $facts['os_service_default'],
   $service_name                         = $::keystone::params::service_name,
   $max_token_size                       = $facts['os_service_default'],
@@ -490,9 +495,10 @@ class keystone(
   }
 
   oslo::messaging::default { 'keystone_config':
-    transport_url        => $default_transport_url,
-    control_exchange     => $control_exchange,
-    rpc_response_timeout => $rpc_response_timeout,
+    executor_thread_pool_size => $executor_thread_pool_size,
+    transport_url             => $default_transport_url,
+    control_exchange          => $control_exchange,
+    rpc_response_timeout      => $rpc_response_timeout,
   }
 
   oslo::messaging::notifications { 'keystone_config':
diff --git a/releasenotes/notes/executor_thread_pool_size-9da1d6c17a448e38.yaml b/releasenotes/notes/executor_thread_pool_size-9da1d6c17a448e38.yaml
new file mode 100644
index 000000000..44037da7c
--- /dev/null
+++ b/releasenotes/notes/executor_thread_pool_size-9da1d6c17a448e38.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``keystone::executor_thread_pool_size`` parameter has been added.
diff --git a/spec/classes/keystone_init_spec.rb b/spec/classes/keystone_init_spec.rb
index e8ea67ba4..5368cf9e8 100644
--- a/spec/classes/keystone_init_spec.rb
+++ b/spec/classes/keystone_init_spec.rb
@@ -54,9 +54,10 @@ describe 'keystone' do
         is_expected.to contain_keystone_config('DEFAULT/notification_opt_out').with_value('<SERVICE DEFAULT>')
 
         is_expected.to contain_oslo__messaging__default('keystone_config').with(
-          :transport_url        => '<SERVICE DEFAULT>',
-          :control_exchange     => '<SERVICE DEFAULT>',
-          :rpc_response_timeout => '<SERVICE DEFAULT>',
+          :executor_thread_pool_size => '<SERVICE DEFAULT>',
+          :transport_url             => '<SERVICE DEFAULT>',
+          :control_exchange          => '<SERVICE DEFAULT>',
+          :rpc_response_timeout      => '<SERVICE DEFAULT>',
         )
 
         is_expected.to contain_oslo__messaging__notifications('keystone_config').with(
@@ -270,15 +271,17 @@ describe 'keystone' do
           :notification_driver        => ['keystone.openstack.common.notifier.rpc_notifier'],
           :notification_topics        => ['notifications'],
           :control_exchange           => 'keystone',
-          :rpc_response_timeout       => 120
+          :rpc_response_timeout       => 120,
+          :executor_thread_pool_size  => 64,
         }
       end
 
       it {
         is_expected.to contain_oslo__messaging__default('keystone_config').with(
-          :transport_url        => 'rabbit://user:pass@host:1234/virt',
-          :control_exchange     => 'keystone',
-          :rpc_response_timeout => 120,
+          :executor_thread_pool_size => 64,
+          :transport_url             => 'rabbit://user:pass@host:1234/virt',
+          :control_exchange          => 'keystone',
+          :rpc_response_timeout      => 120,
         )
 
         is_expected.to contain_oslo__messaging__notifications('keystone_config').with(