openstack
/
cookbook-openstack-image
Code Issues Proposed changes

Merge "Allow oslo rabbit heartbeat configuration"

This commit is contained in:
Jenkins 2015-06-15 17:28:58 +00:00 committed by Gerrit Code Review
parent 5239565718 2f6516755a
commit b2dc2318e7
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spec/spec_helper.rb
View File

@ -239,7 +239,9 @@ shared_examples 'messaging' do
it 'has RPC/AMQP defaults set' do
[/^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)
end
end

6
templates/default/glance-api.conf.erb
View File

@ -783,6 +783,12 @@ qpid_topology_version=<%= node["openstack"]["mq"]["image"]["qpid"]["topology_ver
<% 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)
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
amqp_durable_queues=<%= node["openstack"]["mq"]["image"]["durable_queues"] %>

6
templates/default/glance-registry.conf.erb
View File

@ -316,6 +316,12 @@ qpid_topology_version=<%= node["openstack"]["mq"]["image"]["qpid"]["topology_ver
<% 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)
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
amqp_durable_queues=<%= node["openstack"]["mq"]["image"]["durable_queues"] %>