Browse Source

swift_key should be secret

Change-Id: I1f45a77c75594e03ec2f014be5bf15872fc3ae89
(cherry picked from commit 7cba6e450e)
(cherry picked from commit df82059cc1)
changes/15/773215/1
Takashi Kajinami 4 months ago
parent
commit
de90de5647
2 changed files with 3 additions and 3 deletions
  1. +1
    -1
      manifests/storage/swift.pp
  2. +2
    -2
      spec/classes/gnocchi_storage_swift_spec.rb

+ 1
- 1
manifests/storage/swift.pp View File

@ -93,7 +93,7 @@ will be removed in a future release. Use swift_project_name instead')
gnocchi_config {
'storage/driver': value => 'swift';
'storage/swift_user': value => $swift_user;
'storage/swift_key': value => $swift_key;
'storage/swift_key': value => $swift_key, secret => true;
'storage/swift_project_name': value => $swift_project_name_real;
'storage/swift_user_domain_name': value => $swift_user_domain_name;
'storage/swift_project_domain_name': value => $swift_project_domain_name;


+ 2
- 2
spec/classes/gnocchi_storage_swift_spec.rb View File

@ -15,7 +15,7 @@ describe 'gnocchi::storage::swift' do
it 'configures gnocchi-api with default parameters' do
is_expected.to contain_gnocchi_config('storage/driver').with_value('swift')
is_expected.to contain_gnocchi_config('storage/swift_user').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('storage/swift_key').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('storage/swift_key').with_value('<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_gnocchi_config('storage/swift_authurl').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('storage/swift_project_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_gnocchi_config('storage/swift_user_domain_name').with_value('<SERVICE DEFAULT>')
@ -44,7 +44,7 @@ describe 'gnocchi::storage::swift' do
it 'configures gnocchi-api with given endpoint type' do
is_expected.to contain_gnocchi_config('storage/driver').with_value('swift')
is_expected.to contain_gnocchi_config('storage/swift_user').with_value('swift2')
is_expected.to contain_gnocchi_config('storage/swift_key').with_value('admin')
is_expected.to contain_gnocchi_config('storage/swift_key').with_value('admin').with_secret(true)
is_expected.to contain_gnocchi_config('storage/swift_authurl').with_value('http://localhost:5000')
is_expected.to contain_gnocchi_config('storage/swift_project_name').with_value('service')
is_expected.to contain_gnocchi_config('storage/swift_user_domain_name').with_value('Default')


Loading…
Cancel
Save