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

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

Change-Id: I54aa9068d40e1da01b72ee186e02ebfd3364f426
---
 manifests/init.pp                                    | 12 +++++++++---
 .../executor_thread_pool_size-5daabf2eb43dfdd4.yaml  |  4 ++++
 spec/classes/cinder_init_spec.rb                     |  7 ++++---
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 releasenotes/notes/executor_thread_pool_size-5daabf2eb43dfdd4.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 99130d15..94f86ea6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,6 +22,10 @@
 #   (Optional)
 #   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'].
+#
 # [*notification_transport_url*]
 #   (Optional) A URL representing the messaging driver to use for notifications
 #   and its full configuration. Transport URLs take the form:
@@ -258,6 +262,7 @@ class cinder (
   $default_transport_url                = $facts['os_service_default'],
   $rpc_response_timeout                 = $facts['os_service_default'],
   $control_exchange                     = $facts['os_service_default'],
+  $executor_thread_pool_size            = $facts['os_service_default'],
   $notification_transport_url           = $facts['os_service_default'],
   $notification_driver                  = $facts['os_service_default'],
   $notification_topics                  = $facts['os_service_default'],
@@ -358,9 +363,10 @@ class cinder (
   }
 
   oslo::messaging::default { 'cinder_config':
-    transport_url        => $default_transport_url,
-    rpc_response_timeout => $rpc_response_timeout,
-    control_exchange     => $control_exchange,
+    executor_thread_pool_size => $executor_thread_pool_size,
+    transport_url             => $default_transport_url,
+    rpc_response_timeout      => $rpc_response_timeout,
+    control_exchange          => $control_exchange,
   }
 
   oslo::messaging::notifications { 'cinder_config':
diff --git a/releasenotes/notes/executor_thread_pool_size-5daabf2eb43dfdd4.yaml b/releasenotes/notes/executor_thread_pool_size-5daabf2eb43dfdd4.yaml
new file mode 100644
index 00000000..671befc4
--- /dev/null
+++ b/releasenotes/notes/executor_thread_pool_size-5daabf2eb43dfdd4.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``cinder::executor_thread_pool_size`` parameter has been added.
diff --git a/spec/classes/cinder_init_spec.rb b/spec/classes/cinder_init_spec.rb
index 67cf834b..b6777b50 100644
--- a/spec/classes/cinder_init_spec.rb
+++ b/spec/classes/cinder_init_spec.rb
@@ -19,9 +19,10 @@ describe 'cinder' do
 
       it {
         is_expected.to contain_oslo__messaging__default('cinder_config').with(
-          :transport_url        => '<SERVICE DEFAULT>',
-          :rpc_response_timeout => '<SERVICE DEFAULT>',
-          :control_exchange     => '<SERVICE DEFAULT>'
+          :executor_thread_pool_size => '<SERVICE DEFAULT>',
+          :transport_url             => '<SERVICE DEFAULT>',
+          :rpc_response_timeout      => '<SERVICE DEFAULT>',
+          :control_exchange          => '<SERVICE DEFAULT>'
         )
         is_expected.to contain_oslo__messaging__rabbit('cinder_config').with(
           :rabbit_use_ssl              => '<SERVICE DEFAULT>',