Param rabbit_heartbeat_timeout_threshold should not be 0

Param heartbeat_timeout_threshold by default is set to 60 in oslo module.
We shouldn't set hardcoded value, but take default one.

Change-Id: Id572fd98846f640d88cbb46c4a74f9fd43813d8b
This commit is contained in:
Daniel Pawlik 2017-08-21 10:45:44 +00:00
parent 70232ae4b4
commit 9fb1ab9414
3 changed files with 11 additions and 9 deletions

View File

@ -43,7 +43,7 @@
# Heartbeating helps to ensure the TCP connection to RabbitMQ isn't silently
# closed, resulting in missed or lost messages from the queue.
# (Requires kombu >= 3.0.7 and amqp >= 1.4.0)
# Defaults to 0
# Defaults to $::os_service_default.
#
# [*rabbit_heartbeat_rate*]
# (optional) How often during the rabbit_heartbeat_timeout_threshold period to
@ -326,7 +326,7 @@ class heat(
$rpc_response_timeout = $::os_service_default,
$control_exchange = $::os_service_default,
$rabbit_ha_queues = $::os_service_default,
$rabbit_heartbeat_timeout_threshold = 0,
$rabbit_heartbeat_timeout_threshold = $::os_service_default,
$rabbit_heartbeat_rate = $::os_service_default,
$rabbit_use_ssl = $::os_service_default,
$kombu_ssl_ca_certs = $::os_service_default,
@ -423,10 +423,6 @@ instead.")
purge => $purge_config,
}
if $rabbit_heartbeat_timeout_threshold == 0 {
warning('Default value for rabbit_heartbeat_timeout_threshold parameter is different from OpenStack project defaults')
}
oslo::messaging::rabbit { 'heat_config':
kombu_ssl_version => $kombu_ssl_version,
kombu_ssl_keyfile => $kombu_ssl_keyfile,

View File

@ -0,0 +1,6 @@
---
other:
- |
Change rabbit_heartbeat_timeout_threshold param from 0 (disable the
heartbeat) and use default value from oslo module (unset param in
configuration file).

View File

@ -185,7 +185,7 @@ describe 'heat' do
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_compression').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('0')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__messaging__rabbit('heat_config').with(
:rabbit_use_ssl => '<SERVICE DEFAULT>',
@ -212,7 +212,7 @@ describe 'heat' do
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_compression').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('0')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__messaging__rabbit('heat_config').with(
:rabbit_use_ssl => '<SERVICE DEFAULT>',
@ -238,7 +238,7 @@ describe 'heat' do
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_reconnect_delay').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_failover_strategy').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/kombu_compression').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('0')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_timeout_threshold').with_value('<SERVICE DEFAULT>')
is_expected.to contain_heat_config('oslo_messaging_rabbit/heartbeat_rate').with_value('<SERVICE DEFAULT>')
is_expected.to contain_oslo__messaging__rabbit('heat_config').with(
:rabbit_use_ssl => '<SERVICE DEFAULT>',