openstack
/
cookbook-openstack-compute
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: Ib69e69e1ace08448d789f3eb28749d0d228ae00d
Partial-Bug: #1462438
This commit is contained in:
Mark Vanderwiel 2015-06-05 11:58:15 -05:00
parent 7c43f00c97
commit 51886f084a
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -168,6 +168,8 @@ TODO: move rabbit parameters under openstack["compute"]["mq"]
* `openstack["compute"]["rabbit"]["port"]` - The rabbit port to use
* `openstack["compute"]["rabbit"]["host"]` - The rabbit host to use (must set when `openstack["compute"]["rabbit"]["ha"]` false).
* `openstack["compute"]["rabbit"]["ha"]` - Whether or not to use rabbit ha
* `openstack["compute"]["rabbit"]["heartbeat_timeout_threshold"]` - Number of seconds after which the Rabbit broker is considered down if heartbeat's keep-alive fails (0 disable the heartbeat)
* `openstack["compute"]["rabbit"]["heartbeat_rate"]` - How often times during the heartbeat_timeout_threshold we check the heartbeat
* `openstack["compute"]["mq"]["qpid"]["host"]` - The qpid host to use
* `openstack["compute"]["mq"]["qpid"]["port"]` - The qpid port to use

1
spec/nova-common_spec.rb
View File

@ -423,6 +423,7 @@ describe 'openstack-compute::nova-common' do
it 'has default rabbit_* options set' do
[/^amqp_durable_queues=false$/, /^amqp_auto_delete=false$/,
/^heartbeat_timeout_threshold=0$/, /^heartbeat_rate=2$/,
/^rabbit_userid=guest$/, /^rabbit_password=mq-pass$/,
/^rabbit_virtual_host=\/$/, /^rabbit_host=127.0.0.1$/,
/^rabbit_max_retries=0$/, /^rabbit_retry_interval=1$/,

10
templates/default/nova.conf.erb
View File

@ -803,13 +803,13 @@ admin_tenant_name=<%= node['openstack']['compute']['bare-metal']['admin_tenant_n
lock_path=<%= node["openstack"]["compute"]["lock_path"] %>
<% if @mq_service_type == "qpid" %>
[oslo_messaging_qpid]
#
# From oslo.messaging
#
<% if @mq_service_type == "qpid" %>
# Use durable queues in AMQP. (boolean value)
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
amqp_durable_queues=<%= node['openstack']['mq']['compute']['durable_queues'] %>
@ -835,13 +835,19 @@ qpid_tcp_nodelay=<%= node["openstack"]["mq"]["compute"]["qpid"]["tcp_nodelay"] %
qpid_topology_version=<%= node['openstack']['mq']['compute']['qpid']['topology_version'] %>
<% end %>
<% if @mq_service_type == "rabbitmq" %>
[oslo_messaging_rabbit]
#
# From oslo.messaging
#
<% if @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']['compute']['rabbit']['heartbeat_timeout_threshold'] %>
# How often times during the heartbeat_timeout_threshold we check the heartbeat
heartbeat_rate=<%= node['openstack']['mq']['compute']['rabbit']['heartbeat_rate'] %>
# Use durable queues in AMQP. (boolean value)
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
amqp_durable_queues=<%= node['openstack']['mq']['compute']['durable_queues'] %>