Browse Source

Service_token_roles_required missing in the server config file

Service_token_roles_required missing in the server config file which
allows backwards compatibility to ensure that the service tokens are
compared against a list of possible roles for validity.

Change-Id: Ic46519231da4dd54c139176d25292e0b15609c26
Closes-Bug: 1778198
tags/14.3.0
ZhongShengping 3 months ago
parent
commit
fa35dc12a9

+ 8
- 0
manifests/keystone/authtoken.pp View File

@@ -161,6 +161,12 @@
161 161
 #   (in seconds). Set to -1 to disable caching completely. Integer value
162 162
 #   Defaults to $::os_service_default.
163 163
 #
164
+# [*service_token_roles_required*]
165
+#   (optional) backwards compatibility to ensure that the service tokens are
166
+#   compared against a list of possible roles for validity
167
+#   true/false
168
+#   Defaults to $::os_service_default.
169
+#
164 170
 # DEPRECATED PARAMETERS
165 171
 #
166 172
 # [*check_revocations_for_cached*]
@@ -213,6 +219,7 @@ class manila::keystone::authtoken(
213 219
   $manage_memcache_package        = false,
214 220
   $region_name                    = $::os_service_default,
215 221
   $token_cache_time               = $::os_service_default,
222
+  $service_token_roles_required   = $::os_service_default,
216 223
   # DEPRECATED PARAMETERS
217 224
   $check_revocations_for_cached   = undef,
218 225
   $hash_algorithms                = undef,
@@ -265,5 +272,6 @@ class manila::keystone::authtoken(
265 272
     manage_memcache_package        => $manage_memcache_package,
266 273
     region_name                    => $region_name,
267 274
     token_cache_time               => $token_cache_time,
275
+    service_token_roles_required   => $service_token_roles_required,
268 276
   }
269 277
 }

+ 5
- 0
releasenotes/notes/service_token_roles_required-8365413050d17559.yaml View File

@@ -0,0 +1,5 @@
1
+---
2
+features:
3
+  - Service_token_roles_required missing in the server config file which
4
+    allows backwards compatibility to ensure that the service tokens are
5
+    compared against a list of possible roles for validity.

+ 3
- 0
spec/classes/manila_keystone_authtoken_spec.rb View File

@@ -47,6 +47,7 @@ describe 'manila::keystone::authtoken' do
47 47
         is_expected.to contain_manila_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
48 48
         is_expected.to contain_manila_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
49 49
         is_expected.to contain_manila_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
50
+        is_expected.to contain_manila_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
50 51
       end
51 52
     end
52 53
 
@@ -85,6 +86,7 @@ describe 'manila::keystone::authtoken' do
85 86
           :manage_memcache_package              => true,
86 87
           :region_name                          => 'region2',
87 88
           :token_cache_time                     => '301',
89
+          :service_token_roles_required         => false,
88 90
         })
89 91
       end
90 92
 
@@ -120,6 +122,7 @@ describe 'manila::keystone::authtoken' do
120 122
         is_expected.to contain_manila_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
121 123
         is_expected.to contain_manila_config('keystone_authtoken/region_name').with_value(params[:region_name])
122 124
         is_expected.to contain_manila_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
125
+        is_expected.to contain_manila_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
123 126
       end
124 127
 
125 128
       it 'installs python memcache package' do

Loading…
Cancel
Save