Merge "Make sure redis urls are hidden"

This commit is contained in:
Zuul 2023-03-21 15:20:39 +00:00 committed by Gerrit Code Review
commit e8edb44500
4 changed files with 6 additions and 6 deletions

View File

@ -40,6 +40,6 @@ class gnocchi (
manage_config => false,
}
gnocchi_config {
'DEFAULT/coordination_url' : value => $coordination_url;
'DEFAULT/coordination_url' : value => $coordination_url, secret => true;
}
}

View File

@ -15,8 +15,8 @@ class gnocchi::storage::incoming::redis(
include gnocchi::deps
gnocchi_config {
'incoming/driver': value => 'redis';
'incoming/redis_url': value => $redis_url;
'incoming/driver': value => 'redis';
'incoming/redis_url': value => $redis_url, secret => true;
}
}

View File

@ -28,7 +28,7 @@ describe 'gnocchi' do
end
it 'does not configure coordination_url' do
is_expected.to contain_gnocchi_config('DEFAULT/coordination_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('DEFAULT/coordination_url').with_value('<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_oslo__coordination('gnocchi_config').with(
:backend_url => '<SERVICE DEFAULT>',
:manage_config => false,
@ -49,7 +49,7 @@ describe 'gnocchi' do
end
it 'configures coordination' do
is_expected.to contain_gnocchi_config('DEFAULT/coordination_url').with_value('redis://localhost:6379')
is_expected.to contain_gnocchi_config('DEFAULT/coordination_url').with_value('redis://localhost:6379').with_secret(true)
is_expected.to contain_oslo__coordination('gnocchi_config').with(
:backend_url => 'redis://localhost:6379',
:manage_config => false,

View File

@ -17,7 +17,7 @@ describe 'gnocchi::storage::incoming::redis' do
context 'with redis' do
it 'configures gnocchi incoming driver with redis' do
is_expected.to contain_gnocchi_config('incoming/driver').with_value('redis')
is_expected.to contain_gnocchi_config('incoming/redis_url').with_value('http://localhost:6378')
is_expected.to contain_gnocchi_config('incoming/redis_url').with_value('http://localhost:6378').with_secret(true)
end
end
end