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: Idd23d6b6d3c2bd1d81d9387cacb4471599e56e88
Closes-Bug: 1778198
ZhongShengping 3 months ago
parent
commit
1c40ef70f3

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

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

+ 5
- 0
releasenotes/notes/service_token_roles_required-8a40b333668b42ae.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/ec2api_keystone_authtoken_spec.rb View File

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

Loading…
Cancel
Save