diff --git a/manifests/init.pp b/manifests/init.pp
index 007fd383..fd4573eb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,6 +22,10 @@
 #   (Optional) Use these options to configure the RabbitMQ message system.
 #   Defaults to 'rabbit'
 #
+# [*rpc_response_timeout*]
+#   (optional) Seconds to wait for a response from a call
+#   Defaults to $::os_service_default
+#
 # [*control_exchange*]
 #   (Optional)
 #   Defaults to 'openstack'.
@@ -315,6 +319,7 @@ class cinder (
   $database_max_overflow              = undef,
   $default_transport_url              = $::os_service_default,
   $rpc_backend                        = 'rabbit',
+  $rpc_response_timeout               = $::os_service_default,
   $control_exchange                   = 'openstack',
   $rabbit_ha_queues                   = $::os_service_default,
   $rabbit_heartbeat_timeout_threshold = $::os_service_default,
@@ -462,8 +467,9 @@ deprecated. Please use cinder::default_transport_url instead.")
   }
 
   oslo::messaging::default { 'cinder_config':
-    transport_url    => $default_transport_url,
-    control_exchange => $control_exchange,
+    transport_url        => $default_transport_url,
+    rpc_response_timeout => $rpc_response_timeout,
+    control_exchange     => $control_exchange,
   }
 
   if ! $default_availability_zone {
diff --git a/releasenotes/notes/add-rpc_response_timeout-support-da14d27548bac085.yaml b/releasenotes/notes/add-rpc_response_timeout-support-da14d27548bac085.yaml
new file mode 100644
index 00000000..861d2d6d
--- /dev/null
+++ b/releasenotes/notes/add-rpc_response_timeout-support-da14d27548bac085.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds support for rpc_response_timeout option.
diff --git a/spec/classes/cinder_init_spec.rb b/spec/classes/cinder_init_spec.rb
index 15d20813..7a14ade6 100644
--- a/spec/classes/cinder_init_spec.rb
+++ b/spec/classes/cinder_init_spec.rb
@@ -34,6 +34,7 @@ describe 'cinder' do
     it 'should contain default config' do
       is_expected.to contain_cinder_config('DEFAULT/transport_url').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_cinder_config('DEFAULT/rpc_backend').with(:value => 'rabbit')
+      is_expected.to contain_cinder_config('DEFAULT/rpc_response_timeout').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_cinder_config('DEFAULT/control_exchange').with(:value => 'openstack')
       is_expected.to contain_cinder_config('DEFAULT/report_interval').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_cinder_config('DEFAULT/service_down_time').with(:value => '<SERVICE DEFAULT>')