From 015d353f0ba78e3f420c5a740eb1c96be595f15c Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Fri, 15 Feb 2019 10:03:08 +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: I1ddaeaef16995c80dae8389de9b50cc517bbf53f Closes-Bug: 1778198 --- manifests/keystone/authtoken.pp | 8 ++++++++ .../service_token_roles_required-94f66345c25d21cc.yaml | 5 +++++ spec/classes/placement_keystone_authtoken_spec.rb | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/service_token_roles_required-94f66345c25d21cc.yaml diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index f1e38ad..4be1f0a 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. +# class placement::keystone::authtoken( $username = 'placement', $password = $::os_service_default, @@ -194,6 +200,7 @@ class placement::keystone::authtoken( $manage_memcache_package = false, $region_name = $::os_service_default, $token_cache_time = $::os_service_default, + $service_token_roles_required = $::os_service_default, ) { include ::placement::deps @@ -231,5 +238,6 @@ class placement::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-94f66345c25d21cc.yaml b/releasenotes/notes/service_token_roles_required-94f66345c25d21cc.yaml new file mode 100644 index 0000000..60a4521 --- /dev/null +++ b/releasenotes/notes/service_token_roles_required-94f66345c25d21cc.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/placement_keystone_authtoken_spec.rb b/spec/classes/placement_keystone_authtoken_spec.rb index ee98417..4115d5b 100644 --- a/spec/classes/placement_keystone_authtoken_spec.rb +++ b/spec/classes/placement_keystone_authtoken_spec.rb @@ -40,6 +40,7 @@ describe 'placement::keystone::authtoken' do is_expected.to contain_placement_config('keystone_authtoken/memcached_servers').with_value('') is_expected.to contain_placement_config('keystone_authtoken/region_name').with_value('') is_expected.to contain_placement_config('keystone_authtoken/token_cache_time').with_value('') + is_expected.to contain_placement_config('keystone_authtoken/service_token_roles_required').with_value('') } end @@ -78,6 +79,7 @@ describe 'placement::keystone::authtoken' do :manage_memcache_package => true, :region_name => 'region2', :token_cache_time => '301', + :service_token_roles_required => false, }) end @@ -113,6 +115,7 @@ describe 'placement::keystone::authtoken' do is_expected.to contain_placement_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211') is_expected.to contain_placement_config('keystone_authtoken/region_name').with_value(params[:region_name]) is_expected.to contain_placement_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) + is_expected.to contain_placement_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) } it { is_expected.to contain_package('python-memcache') }