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

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

Change-Id: I260f33942bcd08396c099e52ba970ad8ad5da9d8
---
 manifests/init.pp                                 | 12 +++++++++---
 ...xecutor_thread_pool_size-5cbf844897b55c15.yaml |  4 ++++
 spec/classes/manila_init_spec.rb                  | 15 +++++++++------
 3 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 releasenotes/notes/executor_thread_pool_size-5cbf844897b55c15.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 53c13bf4..a09eb13c 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -20,6 +20,10 @@
 #   (Optional) The default exchange under which topics are scope.
 #   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'].
+#
 # [*package_ensure*]
 #    (Optional) Ensure state for package.
 #    Defaults to 'present'
@@ -204,6 +208,7 @@ class manila (
   $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         = 'messaging',
   $notification_topics         = $facts['os_service_default'],
@@ -304,9 +309,10 @@ class manila (
   }
 
   oslo::messaging::default { 'manila_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 { 'manila_config':
diff --git a/releasenotes/notes/executor_thread_pool_size-5cbf844897b55c15.yaml b/releasenotes/notes/executor_thread_pool_size-5cbf844897b55c15.yaml
new file mode 100644
index 00000000..3eccc08c
--- /dev/null
+++ b/releasenotes/notes/executor_thread_pool_size-5cbf844897b55c15.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``manila::executor_thread_pool_size`` parameter has been added.
diff --git a/spec/classes/manila_init_spec.rb b/spec/classes/manila_init_spec.rb
index 4ba8f4da..c65cfc87 100644
--- a/spec/classes/manila_init_spec.rb
+++ b/spec/classes/manila_init_spec.rb
@@ -22,9 +22,10 @@ describe 'manila' do
 
       it 'should contain default config' do
         is_expected.to contain_oslo__messaging__default('manila_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__notifications('manila_config').with(
           :transport_url => '<SERVICE DEFAULT>',
@@ -186,13 +187,15 @@ describe 'manila' do
           :rpc_response_timeout       => '120',
           :control_exchange           => 'manila',
           :notification_transport_url => 'rabbit://rabbit_user:password@localhost:5673',
+          :executor_thread_pool_size  => 64,
         }
       end
 
       it { is_expected.to contain_oslo__messaging__default('manila_config').with(
-        :transport_url        => 'rabbit://rabbit_user:password@localhost:5673',
-        :rpc_response_timeout => '120',
-        :control_exchange     => 'manila',
+        :executor_thread_pool_size => 64,
+        :transport_url             => 'rabbit://rabbit_user:password@localhost:5673',
+        :rpc_response_timeout      => '120',
+        :control_exchange          => 'manila',
       ) }
 
       it { is_expected.to contain_oslo__messaging__notifications('manila_config').with(