openstack/puppet-aodh
Code Issues Proposed changes

Add support for [DEFAULT] enable_evaluation_results_metrics

Browse Source 
... 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:
Takashi Kajinami
2025-08-13 01:48:31 +09:00
parent 6083fe163d
commit 9230dcb5bf
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@@ -180,6 +180,10 @@
# message, which failed to be delivered due to a recoverable error. # message, which failed to be delivered due to a recoverable error.
# Defaults to $facts['os_service_default']. # Defaults to $facts['os_service_default'].
# #
# [*enable_evaluation_results_metrics*]
# (Optional) Enable evaluation results metrics
# Defaults to $facts['os_service_default'].
#
# [*purge_config*] # [*purge_config*]
# (optional) Whether to set only the specified config options # (optional) Whether to set only the specified config options
# in the aodh config. # in the aodh config.
@@ -234,6 +238,7 @@ class aodh (
$notification_driver = $facts['os_service_default'], $notification_driver = $facts['os_service_default'],
$notification_topics = $facts['os_service_default'], $notification_topics = $facts['os_service_default'],
$notification_retry = $facts['os_service_default'], $notification_retry = $facts['os_service_default'],
$enable_evaluation_results_metrics = $facts['os_service_default'],
Boolean $purge_config = false, Boolean $purge_config = false,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$rabbit_heartbeat_in_pthread = undef, $rabbit_heartbeat_in_pthread = undef,
@@ -296,7 +301,8 @@ class aodh (
} }
aodh_config { 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': oslo::concurrency { 'aodh_config':

5
releasenotes/notes/enable_evaluation_results_metrics-2d4717f2a3eb3166.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
features:
- |
The new ``aodh::enable_evaluation_results_metrics`` parameter has been
added.

7
spec/classes/aodh_init_spec.rb
View File

@@ -66,6 +66,7 @@ describe 'aodh' do
it 'configures other parameters' 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('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( is_expected.to contain_oslo__concurrency('aodh_config').with(
:lock_path => '<SERVICE DEFAULT>' :lock_path => '<SERVICE DEFAULT>'
) )
@@ -115,7 +116,8 @@ describe 'aodh' do
:notification_topics => 'openstack', :notification_topics => 'openstack',
:notification_retry => 10, :notification_retry => 10,
:package_ensure => '2012.1.1-15.el6', :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', :lock_path => '/var/lock/aodh',
} }
end end
@@ -163,7 +165,8 @@ describe 'aodh' do
end end
it 'configures other parameters' do 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( is_expected.to contain_oslo__concurrency('aodh_config').with(
:lock_path => '/var/lock/aodh' :lock_path => '/var/lock/aodh'
) )