From d3b2dd80abc0a3a0dc9ae9ed9c417a11b38183b7 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Thu, 14 Feb 2019 17:27:04 +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: I75c8036cfd0e538309f11284a087753c50d12394 Closes-Bug: 1778198 --- manifests/keystone/authtoken.pp | 8 ++++++++ .../service_token_roles_required-b205ae3274e65db4.yaml | 5 +++++ spec/classes/aodh_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/service_token_roles_required-b205ae3274e65db4.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 34a25429..d44fd883 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -161,6 +161,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*] @@ -213,6 +219,7 @@ class aodh::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, @@ -265,5 +272,6 @@ class aodh::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-b205ae3274e65db4.yaml b/releasenotes/notes/service_token_roles_required-b205ae3274e65db4.yaml new file mode 100644 index 00000000..60a45217 --- /dev/null +++ b/releasenotes/notes/service_token_roles_required-b205ae3274e65db4.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/aodh_keystone_authtoken_spec.rb b/spec/classes/aodh_keystone_authtoken_spec.rb index 9b01986d..dd976d0b 100644 --- a/spec/classes/aodh_keystone_authtoken_spec.rb +++ b/spec/classes/aodh_keystone_authtoken_spec.rb @@ -42,6 +42,7 @@ describe 'aodh::keystone::authtoken' do is_expected.to contain_aodh_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_aodh_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value('') + is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value('') end end @@ -82,6 +83,7 @@ describe 'aodh::keystone::authtoken' do :manage_memcache_package => true, :region_name => 'region2', :token_cache_time => '301', + :service_token_roles_required => false, }) end @@ -117,6 +119,7 @@ describe 'aodh::keystone::authtoken' do is_expected.to contain_aodh_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_aodh_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_aodh_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) + is_expected.to contain_aodh_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) end it 'installs python memcache package' do