From a3f83dfe1fd57db31666dc2463783ffd9274597c Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Fri, 15 Feb 2019 10:03:11 +0800 Subject: [PATCH] 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: I035313023dfb6efd29b6706262490c78da3557e1 Closes-Bug: 1778198 --- manifests/keystone/authtoken.pp | 8 ++++++++ .../service_token_roles_required-a4f14cc2f29c8c12.yaml | 5 +++++ spec/classes/watcher_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/service_token_roles_required-a4f14cc2f29c8c12.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 08263d5..9ef5db4 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -163,6 +163,12 @@ # (in seconds). Set to -1 to disable caching completely. Integer value # Defaults to $::os_service_default. # +# [*service_token_roles_required*] +# (optional) backwards compatibility to ensure that the service tokens are +# compared against a list of possible roles for validity +# true/false +# Defaults to $::os_service_default. +# # DEPRECATED PARAMETERS # # [*check_revocations_for_cached*] @@ -215,6 +221,7 @@ class watcher::keystone::authtoken ( $manage_memcache_package = false, $region_name = $::os_service_default, $token_cache_time = $::os_service_default, + $service_token_roles_required = $::os_service_default, # DEPRECATED PARAMETERS $check_revocations_for_cached = undef, $hash_algorithms = undef, @@ -269,6 +276,7 @@ class watcher::keystone::authtoken ( manage_memcache_package => $manage_memcache_package, region_name => $region_name, token_cache_time => $token_cache_time, + service_token_roles_required => $service_token_roles_required, } } diff --git a/releasenotes/notes/service_token_roles_required-a4f14cc2f29c8c12.yaml b/releasenotes/notes/service_token_roles_required-a4f14cc2f29c8c12.yaml new file mode 100644 index 0000000..60a4521 --- /dev/null +++ b/releasenotes/notes/service_token_roles_required-a4f14cc2f29c8c12.yaml @@ -0,0 +1,5 @@ +--- +features: + - 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. diff --git a/spec/classes/watcher_keystone_authtoken_spec.rb b/spec/classes/watcher_keystone_authtoken_spec.rb index 4a7e2ba..ca67c91 100644 --- a/spec/classes/watcher_keystone_authtoken_spec.rb +++ b/spec/classes/watcher_keystone_authtoken_spec.rb @@ -46,6 +46,7 @@ describe 'watcher::keystone::authtoken' do is_expected.to contain_watcher_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_watcher_config('keystone_authtoken/token_cache_time').with_value('') + is_expected.to contain_watcher_config('keystone_authtoken/service_token_roles_required').with_value('') end end @@ -84,6 +85,7 @@ describe 'watcher::keystone::authtoken' do :manage_memcache_package => true, :region_name => 'region2', :token_cache_time => '301', + :service_token_roles_required => false, }) end @@ -119,6 +121,7 @@ describe 'watcher::keystone::authtoken' do is_expected.to contain_watcher_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_watcher_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_watcher_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) + is_expected.to contain_watcher_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) end it 'installs python memcache package' do