openstack
/
cookbook-openstack-bare-metal
Code Issues Proposed changes

Merge "Allow oslo rabbit heartbeat configuration"

This commit is contained in:
Jenkins 2015-06-22 17:24:25 +00:00 committed by Gerrit Code Review
parent 34d60dbc2c 39f88a3e48
commit 2e36ff2829
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/ironic-common_spec.rb
View File

@ -179,7 +179,9 @@ describe 'openstack-bare-metal::ironic-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

6
templates/default/ironic.conf.erb
View File

@ -1118,6 +1118,12 @@ qpid_topology_version=<%= node['openstack']['mq']['bare-metal']['qpid']['topolog
# 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']['bare-metal']['rabbit']['heartbeat_timeout_threshold'] %>
# How often times during the heartbeat_timeout_threshold we check the heartbeat
heartbeat_rate=<%= node['openstack']['mq']['bare-metal']['rabbit']['heartbeat_rate'] %>
# Use durable queues in AMQP. (boolean value)
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
amqp_durable_queues=<%= node['openstack']['mq']['bare-metal']['durable_queues'] %>