openstack/puppet-neutron
Code Issues Proposed changes

Merge "Service_token_roles_required missing in the server config file"

Browse Source
This commit is contained in:
Zuul 2018-07-12 01:56:15 +00:00 committed by Gerrit Code Review
commit 296483e396
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

@ -178,6 +178,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
#
# [*auth_uri*]
@ -219,6 +225,7 @@ class neutron::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
$auth_uri = undef,
) {
@ -269,5 +276,6 @@ class neutron::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-c07f2c2e0ed118c3.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/neutron_keystone_authtoken_spec.rb
View File

@ -44,6 +44,7 @@ describe 'neutron::keystone::authtoken' do
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
end
end
@ -84,6 +85,7 @@ describe 'neutron::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 'neutron::keystone::authtoken' do
is_expected.to contain_neutron_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
is_expected.to contain_neutron_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
end
it 'installs python memcache package' do