diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index c935b3c..45742c0 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -370,7 +370,9 @@ describe 'openstack-block-storage::cinder-common' do
           it 'has default RPC/AMQP options set' do
             [/^rpc_conn_pool_size=30$/,
              /^amqp_durable_queues=false$/,
-             /^amqp_auto_delete=false$/].each do |line|
+             /^amqp_auto_delete=false$/,
+             /^heartbeat_timeout_threshold=0$/,
+             /^heartbeat_rate=2$/].each do |line|
               expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', line)
             end
           end
diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb
index f025949..d334d41 100644
--- a/templates/default/cinder.conf.erb
+++ b/templates/default/cinder.conf.erb
@@ -1265,6 +1265,12 @@ notification_topics=<%= node["openstack"]["mq"]["block-storage"]["qpid"]["notifi
 # From oslo.messaging
 #
 
+# Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat)
+heartbeat_timeout_threshold=<%= node['openstack']['mq']['block-storage']['rabbit']['heartbeat_timeout_threshold'] %>
+
+# How often times during the heartbeat_timeout_threshold we check the heartbeat
+heartbeat_rate=<%= node['openstack']['mq']['block-storage']['rabbit']['heartbeat_rate'] %>
+
 # from oslo/messaging/_drivers/amqp.py
 amqp_durable_queues=<%= node['openstack']['mq']['block-storage']['durable_queues'] %>
 amqp_auto_delete=<%= node['openstack']['mq']['block-storage']['auto_delete'] %>