From 0b47b9c86cc9370fcb2f386069c91c8b4fd20e7f Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 14 Feb 2024 18:38:57 +0900 Subject: [PATCH] Support new telemetry-tempest-plugin options This change introduces support for the following options which were recently added to telemetry-tempest-plugin. - [telemetry_services] metric_backends - [telemetry_services] alarm_backend Change-Id: I3ad396a55de25a0166746f21a0c372097d36e389 --- manifests/init.pp | 11 +++++++++++ .../telemetry-backend-opts-175651d019fccf4d.yaml | 5 +++++ spec/classes/tempest_init_spec.rb | 2 ++ 3 files changed, 18 insertions(+) create mode 100644 releasenotes/notes/telemetry-backend-opts-175651d019fccf4d.yaml diff --git a/manifests/init.pp b/manifests/init.pp index 9cd9f482..84e661b2 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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; } oslo::concurrency { 'tempest_config': lock_path => $lock_path } diff --git a/releasenotes/notes/telemetry-backend-opts-175651d019fccf4d.yaml b/releasenotes/notes/telemetry-backend-opts-175651d019fccf4d.yaml new file mode 100644 index 00000000..3320b834 --- /dev/null +++ b/releasenotes/notes/telemetry-backend-opts-175651d019fccf4d.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The ``metric_backends`` parameter and the ``alarm_backend`` parameter has + been added to the ``tempest`` class. diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 4058e3e4..6d0cd778 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -363,6 +363,8 @@ describe 'tempest' do is_expected.to contain_tempest_config('share/multitenancy_enabled').with(:value => '') is_expected.to contain_tempest_config('share/enable_protocols').with(:value => '') is_expected.to contain_tempest_config('share/multi_backend').with(:value => '') + is_expected.to contain_tempest_config('telemetry_services/metric_backends').with(:value => '') + is_expected.to contain_tempest_config('telemetry_services/alarm_backend').with(:value => '') is_expected.to contain_tempest_config('share/capability_storage_protocol').with(:value => '') is_expected.to contain_tempest_config('cli/cli_dir').with(:value => '') is_expected.to contain_oslo__concurrency('tempest_config').with(