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: Ia22d5b59adea42c4f3d0792bf83b92fa0e11b0c5
Closes-Bug: 1778198
ZhongShengping 3 months ago
parent
commit
532ab0ec88

+ 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 heat::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 heat::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-ae86f905a716e6f4.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/heat_keystone_authtoken_spec.rb View File

@@ -42,6 +42,7 @@ describe 'heat::keystone::authtoken' do
42 42
         is_expected.to contain_heat_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
43 43
         is_expected.to contain_heat_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
44 44
         is_expected.to contain_heat_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
45
+        is_expected.to contain_heat_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
45 46
       end
46 47
     end
47 48
 
@@ -80,6 +81,7 @@ describe 'heat::keystone::authtoken' do
80 81
           :manage_memcache_package              => true,
81 82
           :region_name                          => 'region2',
82 83
           :token_cache_time                     => '301',
84
+          :service_token_roles_required         => false,
83 85
         })
84 86
       end
85 87
 
@@ -115,6 +117,7 @@ describe 'heat::keystone::authtoken' do
115 117
         is_expected.to contain_heat_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
116 118
         is_expected.to contain_heat_config('keystone_authtoken/region_name').with_value(params[:region_name])
117 119
         is_expected.to contain_heat_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
120
+        is_expected.to contain_heat_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
118 121
       end
119 122
 
120 123
       it 'installs python memcache package' do

Loading…
Cancel
Save