Merge "Allow oslo rabbit heartbeat configuration"

This commit is contained in:
Jenkins 2015-06-15 17:31:25 +00:00 committed by Gerrit Code Review
commit 3b5d0de891
2 changed files with 9 additions and 1 deletions

View File

@ -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

View File

@ -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'] %>