openstack/puppet-tripleo
Code Issues Proposed changes

Replace the deprecated aodh::auth class

Browse Source 
... by the new aodh::service_credentials class.

Depends-on: https://review.opendev.org/772694
Depends-on: https://review.opendev.org/779884
Change-Id: I394ac5520504650d122b148f661a0104d35c29a9
This commit is contained in:
Takashi Kajinami 2021-01-31 09:45:42 +09:00
parent dbe34c4b53
commit f37376490a
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, 'ssl' => $oslomsg_notify_use_ssl_real,
}), }),
} }
include aodh::auth include aodh::service_credentials
include aodh::config include aodh::config
include aodh::client include aodh::client
include aodh::db::sync include aodh::db::sync

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 it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::aodh') is_expected.to contain_class('tripleo::profile::base::aodh')
is_expected.to_not contain_class('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::config')
is_expected.to_not contain_class('aodh::client') is_expected.to_not contain_class('aodh::client')
is_expected.to_not contain_class('aodh::db::sync') is_expected.to_not contain_class('aodh::db::sync')
@ -43,7 +43,7 @@ describe 'tripleo::profile::base::aodh' do
is_expected.to contain_class('aodh').with( is_expected.to contain_class('aodh').with(
:default_transport_url => 'rabbit://aodh:foo@127.0.0.1:5672/?ssl=0' :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::config')
is_expected.to contain_class('aodh::client') is_expected.to contain_class('aodh::client')
is_expected.to contain_class('aodh::db::sync') is_expected.to contain_class('aodh::db::sync')
@ -58,7 +58,7 @@ describe 'tripleo::profile::base::aodh' do
it 'should not trigger any configuration' do it 'should not trigger any configuration' do
is_expected.to_not contain_class('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::config')
is_expected.to_not contain_class('aodh::client') is_expected.to_not contain_class('aodh::client')
is_expected.to_not contain_class('aodh::db::sync') is_expected.to_not contain_class('aodh::db::sync')
@ -78,7 +78,7 @@ describe 'tripleo::profile::base::aodh' do
is_expected.to contain_class('aodh').with( is_expected.to contain_class('aodh').with(
:default_transport_url => 'rabbit://aodh:foo@127.0.0.1:5672/?ssl=0' :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::config')
is_expected.to contain_class('aodh::client') is_expected.to contain_class('aodh::client')
is_expected.to contain_class('aodh::db::sync') is_expected.to contain_class('aodh::db::sync')

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

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