Merge "Do not set deprecated [service_available] aodh_plugin"

This commit is contained in:
Zuul 2022-06-07 01:53:36 +00:00 committed by Gerrit Code Review
commit a30ded3712
2 changed files with 3 additions and 3 deletions

View File

@ -549,8 +549,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;

View File

@ -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 => '<SERVICE DEFAULT>')
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)