From 1c40ef70f3b0f8aeab08d55234541ffc45aef5e7 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Fri, 15 Feb 2019 10:03:02 +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: Idd23d6b6d3c2bd1d81d9387cacb4471599e56e88 Closes-Bug: 1778198 --- manifests/keystone/authtoken.pp | 8 ++++++++ .../service_token_roles_required-8a40b333668b42ae.yaml | 5 +++++ spec/classes/ec2api_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/service_token_roles_required-8a40b333668b42ae.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 40e89cd..8946f23 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -160,6 +160,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*] @@ -212,6 +218,7 @@ class ec2api::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, @@ -260,5 +267,6 @@ class ec2api::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-8a40b333668b42ae.yaml b/releasenotes/notes/service_token_roles_required-8a40b333668b42ae.yaml new file mode 100644 index 0000000..60a4521 --- /dev/null +++ b/releasenotes/notes/service_token_roles_required-8a40b333668b42ae.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/ec2api_keystone_authtoken_spec.rb b/spec/classes/ec2api_keystone_authtoken_spec.rb index 7f68b97..9192300 100644 --- a/spec/classes/ec2api_keystone_authtoken_spec.rb +++ b/spec/classes/ec2api_keystone_authtoken_spec.rb @@ -46,6 +46,7 @@ describe 'ec2api::keystone::authtoken' do is_expected.to contain_ec2api_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_ec2api_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_ec2api_config('keystone_authtoken/token_cache_time').with_value('') + is_expected.to contain_ec2api_config('keystone_authtoken/service_token_roles_required').with_value('') end end @@ -86,6 +87,7 @@ describe 'ec2api::keystone::authtoken' do :manage_memcache_package => true, :region_name => 'region2', :token_cache_time => '301', + :service_token_roles_required => false, }) end @@ -121,6 +123,7 @@ describe 'ec2api::keystone::authtoken' do is_expected.to contain_ec2api_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_ec2api_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_ec2api_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) + is_expected.to contain_ec2api_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) end it 'installs python memcache package' do