openstack/puppet-tempest
Code Issues Proposed changes

Merge "Support new telemetry-tempest-plugin options"

Browse Source
This commit is contained in:
Zuul 2024-02-16 16:12:13 +00:00 committed by Gerrit Code Review
commit 3df6c62fa0
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/init.pp
View File

@ -300,6 +300,10 @@
# Defaults to $facts['os_service_default']
# [*share_capability_storage_protocol*]
# Defaults to $facts['os_service_default']
# [*metric_backends*]
# Defaults to $facts['os_service_default']
# [*alarm_backend*]
# Defaults to $facts['os_service_default']
#
# DEPREACTED PARAMETERS
# [*glance_v2*]
@ -490,6 +494,9 @@ class tempest(
$share_enable_protocols = $facts['os_service_default'],
$share_multi_backend = $facts['os_service_default'],
$share_capability_storage_protocol = $facts['os_service_default'],
# telemetry options
$metric_backends = $facts['os_service_default'],
$alarm_backend = $facts['os_service_default'],
# DEPRECATED PARAMETERS
$glance_v2 = undef,
$tempest_config_file = undef,
@ -731,10 +738,14 @@ class tempest(
'load_balancer/observer_role': value => $load_balancer_observer_role;
'load_balancer/global_observer_role': value => $load_balancer_global_observer_role;
'load_balancer/test_with_noop': value => $load_balancer_test_with_noop;
# manila-tempest-plugin
'share/multitenancy_enabled': value => $share_multitenancy_enabled;
'share/enable_protocols': value => join(any2array($share_enable_protocols), ',');
'share/multi_backend': value => $share_multi_backend;
'share/capability_storage_protocol': value => $share_capability_storage_protocol;
# telemetry-tempest-plugin
'telemetry_services/metric_backends': value => join(any2array($metric_backends), ',');
'telemetry_services/alarm_backend': value => $alarm_backend;
}
# TODO(tkajinam): Remove this after 2024.1 release

5
releasenotes/notes/telemetry-backend-opts-175651d019fccf4d.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``metric_backends`` parameter and the ``alarm_backend`` parameter has
been added to the ``tempest`` class.

2
spec/classes/tempest_init_spec.rb
View File

@ -363,6 +363,8 @@ describe 'tempest' do
is_expected.to contain_tempest_config('share/multitenancy_enabled').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('share/enable_protocols').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('share/multi_backend').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('telemetry_services/metric_backends').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('telemetry_services/alarm_backend').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('share/capability_storage_protocol').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('cli/cli_dir').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_oslo__concurrency('tempest_config').with(