openstack/puppet-placement
Code Issues Proposed changes

Merge "Service_token_roles_required missing in the server config file"

Browse Source
This commit is contained in:
Zuul 2019-02-19 01:32:09 +00:00 committed by Gerrit Code Review
commit 66957fd326
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/keystone/authtoken.pp
View File

@ -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
@ -235,5 +242,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,
}
}

5
releasenotes/notes/service_token_roles_required-94f66345c25d21cc.yaml Normal file
View File

@ -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.

3
spec/classes/placement_keystone_authtoken_spec.rb
View File

@ -39,6 +39,7 @@ describe 'placement::keystone::authtoken' do
is_expected.to contain_placement_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_placement_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_placement_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_placement_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
}
end
@ -77,6 +78,7 @@ describe 'placement::keystone::authtoken' do
:manage_memcache_package => true,
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles_required => false,
})
end
@ -112,6 +114,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') }