openstack
/
cookbook-openstack-identity
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: Ied6ad4af67f8915e91c7515f43121da9ee294456
Partial-Bug: #1462438
This commit is contained in:
Mark Vanderwiel 2015-06-05 12:01:19 -05:00 committed by Ma Wen Cheng
parent c029bc71e3
commit ccac1491cf
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spec/server_spec.rb
View File

@ -837,6 +837,8 @@ describe 'openstack-identity::server' do
it 'has defaults for oslo_messaging_rabbit section' do
[/^amqp_durable_queues = false$/,
/^amqp_auto_delete = false$/,
/^heartbeat_timeout_threshold=0$/,
/^heartbeat_rate=2$/,
/^rpc_conn_pool_size = 30$/,
/^rabbit_host = 127.0.0.1$/,
/^rabbit_port = 5672$/,

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

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