diff --git a/manifests/init.pp b/manifests/init.pp
index f7c2bc2c9..3d6d717df 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,6 +30,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) Boolean. Connect over SSL for RabbitMQ. (boolean value)
 #   Defaults to $facts['os_service_default']
@@ -376,6 +380,7 @@ class nova(
   $rpc_response_timeout                   = $facts['os_service_default'],
   $long_rpc_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'],
@@ -647,9 +652,10 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
   }
 
   oslo::messaging::default { 'nova_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,
   }
 
   nova_config {
diff --git a/releasenotes/notes/executor_thread_pool_size-8ad5ffa07de7b44d.yaml b/releasenotes/notes/executor_thread_pool_size-8ad5ffa07de7b44d.yaml
new file mode 100644
index 000000000..63b46cf7a
--- /dev/null
+++ b/releasenotes/notes/executor_thread_pool_size-8ad5ffa07de7b44d.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``nova::executor_thread_pool_size`` parameter has been added.
diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
index 835460fa5..de2394a05 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -31,9 +31,10 @@ describe 'nova' do
 
       it 'configures rabbit' do
         is_expected.to contain_oslo__messaging__default('nova_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('nova_config').with(
           :rabbit_use_ssl              => '<SERVICE DEFAULT>',
@@ -111,6 +112,7 @@ describe 'nova' do
           :rpc_response_timeout                    => '30',
           :long_rpc_timeout                        => '1800',
           :control_exchange                        => 'nova',
+          :executor_thread_pool_size               => 64,
           :rabbit_use_ssl                          => true,
           :rabbit_heartbeat_timeout_threshold      => '60',
           :rabbit_heartbeat_rate                   => '10',
@@ -182,9 +184,10 @@ describe 'nova' do
 
       it 'configures rabbit' do
         is_expected.to contain_oslo__messaging__default('nova_config').with(
-          :transport_url        => 'rabbit://rabbit_user:password@localhost:5673',
-          :rpc_response_timeout => '30',
-          :control_exchange     => 'nova',
+          :executor_thread_pool_size => 64,
+          :transport_url             => 'rabbit://rabbit_user:password@localhost:5673',
+          :rpc_response_timeout      => '30',
+          :control_exchange          => 'nova',
         )
         is_expected.to contain_oslo__messaging__rabbit('nova_config').with(
           :rabbit_use_ssl              => true,