openstack
/
fuel-library
Code Issues Proposed changes

Merge rabbitmq default config vars w/ custom ones 

Merge all sources of rabbitmq config variables in order to
avoid the default settings loss in case when custom config
options come from hiera.

Change-Id: I572bd72b6c9571a49deec9ee683f8e0d76bed9ae
Related-Bug: #1560687
This commit is contained in:
Michael Polenchuk 2016-03-23 15:26:00 +03:00
parent 62756e42ab
commit 9cec7696d1
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
deployment/puppet/osnailyfacter/manifests/rabbitmq/rabbitmq.pp
View File

@ -73,17 +73,18 @@ class osnailyfacter::rabbitmq::rabbitmq {
'net_ticktime' => '10',
}
)
$config_variables = hiera('rabbit_config_variables',
{
'log_levels' => $rabbit_levels,
'default_vhost' => "<<\"/\">>",
'default_permissions' => '[<<".*">>, <<".*">>, <<".*">>]',
'cluster_partition_handling' => $cluster_partition_handling,
'mnesia_table_loading_timeout' => $mnesia_table_loading_timeout,
'collect_statistics_interval' => '30000',
'disk_free_limit' => '5000000', # Corosync checks for disk space, reduce rabbitmq check to 5M see LP#1493520 comment #15
}
)
$config_variables_default = {
'log_levels' => $rabbit_levels,
'default_vhost' => "<<\"/\">>",
'default_permissions' => '[<<".*">>, <<".*">>, <<".*">>]',
'cluster_partition_handling' => $cluster_partition_handling,
'mnesia_table_loading_timeout' => $mnesia_table_loading_timeout,
'collect_statistics_interval' => '30000',
'disk_free_limit' => '5000000', # Corosync checks for disk space, reduce rabbitmq check to 5M see LP#1493520 comment #15
}
$config_variables = merge($config_variables_default, hiera_hash('rabbit_config_variables', {}))
$config_management_variables = hiera('rabbit_config_management_variables',
{
'rates_mode' => 'none',

3
tests/noop/spec/hosts/rabbitmq/rabbitmq_spec.rb
View File

@ -58,6 +58,7 @@ describe manifest do
enable_rpc_ha = Noop.hiera('enable_rpc_ha', 'false')
enable_notifications_ha = Noop.hiera('enable_notifications_ha', 'true')
fqdn_prefix = Noop.hiera('node_name_prefix_for_messaging', 'messaging-')
rabbit_config_variables = Noop.hiera_hash('rabbit_config_variables', {})
let (:params) do {
:admin_enable => true,
@ -76,7 +77,7 @@ describe manifest do
:node_ip_address => rabbitmq_bind_ip_address,
:config_kernel_variables => $config_kernel_variables,
:config_management_variables => $config_management_variables,
:config_variables => $config_variables,
:config_variables => $config_variables.merge(rabbit_config_variables),
:environment_variables => $environment_variables,
:file_limit => file_limit,
:tcp_keepalive => true, }