diff --git a/manifests/init.pp b/manifests/init.pp
index 71689709..82b159b6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,6 +24,10 @@
 #   option.
 #   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'].
+#
 # [*rabbit_use_ssl*]
 #   (optional) Connect over SSL for RabbitMQ
 #   Defaults to $facts['os_service_default']
@@ -185,6 +189,7 @@ class octavia (
   $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'],
   $rabbit_use_ssl                     = $facts['os_service_default'],
   $rabbit_heartbeat_timeout_threshold = $facts['os_service_default'],
   $rabbit_heartbeat_rate              = $facts['os_service_default'],
@@ -268,9 +273,10 @@ class octavia (
   }
 
   oslo::messaging::default { 'octavia_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 { 'octavia_config':
diff --git a/releasenotes/notes/executor_thread_pool_size-4fe786c1a3896dfa.yaml b/releasenotes/notes/executor_thread_pool_size-4fe786c1a3896dfa.yaml
new file mode 100644
index 00000000..20a43b5b
--- /dev/null
+++ b/releasenotes/notes/executor_thread_pool_size-4fe786c1a3896dfa.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``octavia::executor_thread_pool_size`` parameter has been added.
diff --git a/spec/classes/octavia_init_spec.rb b/spec/classes/octavia_init_spec.rb
index 5215a4dc..d85df70f 100644
--- a/spec/classes/octavia_init_spec.rb
+++ b/spec/classes/octavia_init_spec.rb
@@ -29,9 +29,10 @@ describe 'octavia' do
 
       it 'configures rabbit' do
         should contain_oslo__messaging__default('octavia_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>',
         )
         should contain_oslo__messaging__rabbit('octavia_config').with(
           :rabbit_ha_queues            => '<SERVICE DEFAULT>',
@@ -82,6 +83,7 @@ describe 'octavia' do
           :default_transport_url              => 'rabbit://rabbit_user:password@localhost:5673',
           :rpc_response_timeout               => '120',
           :control_exchange                   => 'octavia',
+          :executor_thread_pool_size          => 64,
           :rabbit_ha_queues                   => true,
           :rabbit_heartbeat_timeout_threshold => '60',
           :rabbit_heartbeat_rate              => '10',
@@ -100,9 +102,10 @@ describe 'octavia' do
 
       it 'configures rabbit' do
         should contain_oslo__messaging__default('octavia_config').with(
-          :transport_url        => 'rabbit://rabbit_user:password@localhost:5673',
-          :rpc_response_timeout => '120',
-          :control_exchange     => 'octavia',
+          :executor_thread_pool_size => 64,
+          :transport_url             => 'rabbit://rabbit_user:password@localhost:5673',
+          :rpc_response_timeout      => '120',
+          :control_exchange          => 'octavia',
         )
         should contain_oslo__messaging__rabbit('octavia_config').with(
           :rabbit_ha_queues            => true,