From 6b9b452e67832cc1d2a19bebdc107f53b7c07721 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 3 Jun 2022 14:45:28 +0900 Subject: [PATCH] Do not set deprecated [service_available] aodh_plugin ... because the parameter was already deprecated[1]. [1] 8bccc06c2bc71798f532f4ba6bc873c5e5dbb896 Change-Id: Icfee09ae791cf3c9bf3aa7748237cd9f928cd477 --- manifests/init.pp | 4 ++-- spec/classes/tempest_init_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index b4c4e27f..b4828b4b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -556,8 +556,8 @@ class tempest( 'service_available/heat': value => $heat_available; 'service_available/ceilometer': value => $ceilometer_available; 'service_available/aodh': value => $aodh_available; - # https://bugs.launchpad.net/aodh/+bug/1611406 - 'service_available/aodh_plugin': value => $aodh_available; + # TODO(tkajinam): Remove this after Zed release + 'service_available/aodh_plugin': value => $::os_service_default; 'service_available/barbican': value => $barbican_available; 'service_available/bgpvpn': value => $neutron_bgpvpn_available; 'service_available/gnocchi': value => $gnocchi_available; diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index f1cc2cef..24bdf2fd 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -249,7 +249,7 @@ describe 'tempest' do is_expected.to contain_tempest_config('service_available/heat').with(:value => false) is_expected.to contain_tempest_config('service_available/ceilometer').with(:value => false) is_expected.to contain_tempest_config('service_available/aodh').with(:value => false) - is_expected.to contain_tempest_config('service_available/aodh_plugin').with(:value => false) + is_expected.to contain_tempest_config('service_available/aodh_plugin').with(:value => '') is_expected.to contain_tempest_config('service_available/bgpvpn').with(:value => false) is_expected.to contain_tempest_config('service_available/gnocchi').with(:value => false) is_expected.to contain_tempest_config('service_available/horizon').with(:value => true)