Add support for [DEFAULT] enable_evaluation_results_metrics
... which was added during this cycle. Depends-on: https://review.opendev.org/925775 Change-Id: Ib81309fe456f27051037380ccc6aef2a4bfd556d Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
@@ -180,6 +180,10 @@
|
||||
# message, which failed to be delivered due to a recoverable error.
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*enable_evaluation_results_metrics*]
|
||||
# (Optional) Enable evaluation results metrics
|
||||
# Defaults to $facts['os_service_default'].
|
||||
#
|
||||
# [*purge_config*]
|
||||
# (optional) Whether to set only the specified config options
|
||||
# in the aodh config.
|
||||
@@ -234,6 +238,7 @@ class aodh (
|
||||
$notification_driver = $facts['os_service_default'],
|
||||
$notification_topics = $facts['os_service_default'],
|
||||
$notification_retry = $facts['os_service_default'],
|
||||
$enable_evaluation_results_metrics = $facts['os_service_default'],
|
||||
Boolean $purge_config = false,
|
||||
# DEPRECATED PARAMETERS
|
||||
$rabbit_heartbeat_in_pthread = undef,
|
||||
@@ -296,7 +301,8 @@ class aodh (
|
||||
}
|
||||
|
||||
aodh_config {
|
||||
'database/alarm_history_time_to_live': value => $alarm_history_time_to_live;
|
||||
'database/alarm_history_time_to_live': value => $alarm_history_time_to_live;
|
||||
'DEFAULT/enable_evaluation_results_metrics': value => $enable_evaluation_results_metrics;
|
||||
}
|
||||
|
||||
oslo::concurrency { 'aodh_config':
|
||||
|
@@ -0,0 +1,5 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The new ``aodh::enable_evaluation_results_metrics`` parameter has been
|
||||
added.
|
@@ -66,6 +66,7 @@ describe 'aodh' do
|
||||
|
||||
it 'configures other parameters' do
|
||||
is_expected.to contain_aodh_config('database/alarm_history_time_to_live').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_aodh_config('DEFAULT/enable_evaluation_results_metrics').with_value('<SERVICE DEFAULT>')
|
||||
is_expected.to contain_oslo__concurrency('aodh_config').with(
|
||||
:lock_path => '<SERVICE DEFAULT>'
|
||||
)
|
||||
@@ -115,7 +116,8 @@ describe 'aodh' do
|
||||
:notification_topics => 'openstack',
|
||||
:notification_retry => 10,
|
||||
:package_ensure => '2012.1.1-15.el6',
|
||||
:alarm_history_time_to_live => '604800',
|
||||
:alarm_history_time_to_live => 604800,
|
||||
:enable_evaluation_results_metrics => false,
|
||||
:lock_path => '/var/lock/aodh',
|
||||
}
|
||||
end
|
||||
@@ -163,7 +165,8 @@ describe 'aodh' do
|
||||
end
|
||||
|
||||
it 'configures other parameters' do
|
||||
is_expected.to contain_aodh_config('database/alarm_history_time_to_live').with_value('604800')
|
||||
is_expected.to contain_aodh_config('database/alarm_history_time_to_live').with_value(604800)
|
||||
is_expected.to contain_aodh_config('DEFAULT/enable_evaluation_results_metrics').with_value(false)
|
||||
is_expected.to contain_oslo__concurrency('aodh_config').with(
|
||||
:lock_path => '/var/lock/aodh'
|
||||
)
|
||||
|
Reference in New Issue
Block a user