Browse Source

Merge "Configure access_key and secret_key as secret"

Zuul 9 months ago
parent
commit
7a6e865e7f
2 changed files with 6 additions and 6 deletions
  1. 2
    2
      manifests/backend/s3.pp
  2. 4
    4
      spec/classes/glance_backend_s3_spec.rb

+ 2
- 2
manifests/backend/s3.pp View File

@@ -79,8 +79,8 @@ class glance::backend::s3(
79 79
   }
80 80
 
81 81
   glance_api_config {
82
-    'glance_store/s3_store_access_key':              value => $access_key;
83
-    'glance_store/s3_store_secret_key':              value => $secret_key;
82
+    'glance_store/s3_store_access_key':              value => $access_key, secret => true;
83
+    'glance_store/s3_store_secret_key':              value => $secret_key, secret => true;
84 84
     'glance_store/s3_store_host':                    value => $host;
85 85
     'glance_store/s3_store_bucket':                  value => $bucket;
86 86
     'glance_store/s3_store_bucket_url_format':       value => $bucket_url_format;

+ 4
- 4
spec/classes/glance_backend_s3_spec.rb View File

@@ -15,8 +15,8 @@ describe 'glance::backend::s3' do
15 15
 
16 16
       it 'configures glance-api.conf' do
17 17
         is_expected.to contain_glance_api_config('glance_store/default_store').with_value('s3')
18
-        is_expected.to contain_glance_api_config('glance_store/s3_store_access_key').with_value('access')
19
-        is_expected.to contain_glance_api_config('glance_store/s3_store_secret_key').with_value('secret')
18
+        is_expected.to contain_glance_api_config('glance_store/s3_store_access_key').with_value('access').with_secret(true)
19
+        is_expected.to contain_glance_api_config('glance_store/s3_store_secret_key').with_value('secret').with_secret(true)
20 20
         is_expected.to contain_glance_api_config('glance_store/s3_store_host').with_value('host')
21 21
         is_expected.to contain_glance_api_config('glance_store/s3_store_bucket').with_value('bucket')
22 22
         is_expected.to contain_glance_api_config('glance_store/s3_store_bucket_url_format').with_value('<SERVICE DEFAULT>')
@@ -45,8 +45,8 @@ describe 'glance::backend::s3' do
45 45
       end
46 46
 
47 47
       it 'configures glance-api.conf' do
48
-        is_expected.to contain_glance_api_config('glance_store/s3_store_access_key').with_value('access2')
49
-        is_expected.to contain_glance_api_config('glance_store/s3_store_secret_key').with_value('secret2')
48
+        is_expected.to contain_glance_api_config('glance_store/s3_store_access_key').with_value('access2').with_secret(true)
49
+        is_expected.to contain_glance_api_config('glance_store/s3_store_secret_key').with_value('secret2').with_secret(true)
50 50
         is_expected.to contain_glance_api_config('glance_store/s3_store_host').with_value('host2')
51 51
         is_expected.to contain_glance_api_config('glance_store/s3_store_bucket').with_value('bucket2')
52 52
         is_expected.to contain_glance_api_config('glance_store/s3_store_bucket_url_format').with_value('path')

Loading…
Cancel
Save