openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Replace the deprecated aodh::auth class" into stable/wallaby

This commit is contained in:
Zuul 2022-05-24 17:48:35 +00:00 committed by Gerrit Code Review
parent 0896d77046 89ee9575be
commit 97281c9d41
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/aodh.pp
View File

@ -119,7 +119,7 @@ class tripleo::profile::base::aodh (
'ssl' => $oslomsg_notify_use_ssl_real,
}),
}
include aodh::auth
include aodh::service_credentials
include aodh::config
include aodh::db::sync
include aodh::logging

8
spec/classes/tripleo_profile_base_aodh_spec.rb
View File

@ -23,7 +23,7 @@ describe 'tripleo::profile::base::aodh' do
it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::aodh')
is_expected.to_not contain_class('aodh')
is_expected.to_not contain_class('aodh::auth')
is_expected.to_not contain_class('aodh::service_credentials')
is_expected.to_not contain_class('aodh::config')
is_expected.to_not contain_class('aodh::db::sync')
end
@ -42,7 +42,7 @@ describe 'tripleo::profile::base::aodh' do
is_expected.to contain_class('aodh').with(
:default_transport_url => 'rabbit://aodh:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('aodh::auth')
is_expected.to contain_class('aodh::service_credentials')
is_expected.to contain_class('aodh::config')
is_expected.to contain_class('aodh::db::sync')
end
@ -56,7 +56,7 @@ describe 'tripleo::profile::base::aodh' do
it 'should not trigger any configuration' do
is_expected.to_not contain_class('aodh')
is_expected.to_not contain_class('aodh::auth')
is_expected.to_not contain_class('aodh::service_credentials')
is_expected.to_not contain_class('aodh::config')
is_expected.to_not contain_class('aodh::db::sync')
end
@ -75,7 +75,7 @@ describe 'tripleo::profile::base::aodh' do
is_expected.to contain_class('aodh').with(
:default_transport_url => 'rabbit://aodh:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('aodh::auth')
is_expected.to contain_class('aodh::service_credentials')
is_expected.to contain_class('aodh::config')
is_expected.to contain_class('aodh::db::sync')
end

2
spec/fixtures/hieradata/default.yaml vendored
View File

@ -7,7 +7,7 @@ bootstrap_nodeid: node
aodh_api_bootstrap_node_name: node
aodh::rabbit_password: 'password'
aodh_redis_password: 'password'
aodh::auth::auth_password: 'password'
aodh::service_credentials::password: 'password'
aodh::db::mysql::password: 'password'
aodh::keystone::authtoken::password: 'password'
# barbican profile required hieradata