openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Allow oslo rabbit heartbeat configuration 

In order to allow components to better handle and respond to mq failures,
oslo has some heartbeat options that are useful.

Change-Id: Ief96c7fce659376f476b11b527c60ce999777b81
Partial-Bug: #1462438
This commit is contained in:
Mark Vanderwiel 2015-06-05 12:08:19 -05:00 committed by Ma Wen Cheng
parent 0be74cdcd1
commit 4b0d6b1ec0
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spec/default_spec.rb
View File

@ -525,6 +525,13 @@ describe 'openstack-network' do
end
end
it 'has default heartbeat options set' do
[/^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
it 'sets the rabbit_userid attribute' do
expect(chef_run).to render_config_file(file.name).with_section_content('oslo_messaging_rabbit', /^rabbit_userid=#{userid}$/)
end

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

@ -389,6 +389,12 @@ qpid_topology_version=<%= node['openstack']['mq']['network']['qpid']['topology_v
# 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']['network']['rabbit']['heartbeat_timeout_threshold'] %>
# How often times during the heartbeat_timeout_threshold we check the heartbeat
heartbeat_rate=<%= node['openstack']['mq']['network']['rabbit']['heartbeat_rate'] %>
# AMQP queue config options
amqp_durable_queues=<%= node['openstack']['mq']['network']['durable_queues'] %>
amqp_auto_delete=<%= node['openstack']['mq']['network']['auto_delete'] %>