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: I41b3fc4699a4f285e9fcb066da55bb8a7f1361a2 Partial-Bug: #1462438
This commit is contained in:
parent
1a9655f53e
commit
2f6516755a
|
@ -239,7 +239,9 @@ shared_examples 'messaging' do
|
||||||
|
|
||||||
it 'has RPC/AMQP defaults set' do
|
it 'has RPC/AMQP defaults set' do
|
||||||
[/^amqp_durable_queues=false$/,
|
[/^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_file(file_name).with_content(line)
|
expect(chef_run).to render_file(file_name).with_content(line)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -783,6 +783,12 @@ qpid_topology_version=<%= node["openstack"]["mq"]["image"]["qpid"]["topology_ver
|
||||||
|
|
||||||
<% if @notification_driver == "messaging" && @mq_service_type == "rabbitmq" %>
|
<% if @notification_driver == "messaging" && @mq_service_type == "rabbitmq" %>
|
||||||
|
|
||||||
|
# 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']['image']['rabbit']['heartbeat_timeout_threshold'] %>
|
||||||
|
|
||||||
|
# How often times during the heartbeat_timeout_threshold we check the heartbeat
|
||||||
|
heartbeat_rate=<%= node['openstack']['mq']['image']['rabbit']['heartbeat_rate'] %>
|
||||||
|
|
||||||
# Use durable queues in AMQP. (boolean value)
|
# Use durable queues in AMQP. (boolean value)
|
||||||
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
||||||
amqp_durable_queues=<%= node["openstack"]["mq"]["image"]["durable_queues"] %>
|
amqp_durable_queues=<%= node["openstack"]["mq"]["image"]["durable_queues"] %>
|
||||||
|
|
|
@ -316,6 +316,12 @@ qpid_topology_version=<%= node["openstack"]["mq"]["image"]["qpid"]["topology_ver
|
||||||
|
|
||||||
<% if @notification_driver == "messaging" && @mq_service_type == "rabbitmq" %>
|
<% if @notification_driver == "messaging" && @mq_service_type == "rabbitmq" %>
|
||||||
|
|
||||||
|
# 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']['image']['rabbit']['heartbeat_timeout_threshold'] %>
|
||||||
|
|
||||||
|
# How often times during the heartbeat_timeout_threshold we check the heartbeat
|
||||||
|
heartbeat_rate=<%= node['openstack']['mq']['image']['rabbit']['heartbeat_rate'] %>
|
||||||
|
|
||||||
# Use durable queues in AMQP. (boolean value)
|
# Use durable queues in AMQP. (boolean value)
|
||||||
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
|
||||||
amqp_durable_queues=<%= node["openstack"]["mq"]["image"]["durable_queues"] %>
|
amqp_durable_queues=<%= node["openstack"]["mq"]["image"]["durable_queues"] %>
|
||||||
|
|
Loading…
Reference in New Issue