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
This commit is contained in:
@@ -161,6 +161,12 @@
|
|||||||
# (in seconds). Set to -1 to disable caching completely. Integer value
|
# (in seconds). Set to -1 to disable caching completely. Integer value
|
||||||
# Defaults to $::os_service_default.
|
# 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(
|
class placement::keystone::authtoken(
|
||||||
$username = 'placement',
|
$username = 'placement',
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
@@ -194,6 +200,7 @@ class placement::keystone::authtoken(
|
|||||||
$manage_memcache_package = false,
|
$manage_memcache_package = false,
|
||||||
$region_name = $::os_service_default,
|
$region_name = $::os_service_default,
|
||||||
$token_cache_time = $::os_service_default,
|
$token_cache_time = $::os_service_default,
|
||||||
|
$service_token_roles_required = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::placement::deps
|
include ::placement::deps
|
||||||
@@ -231,5 +238,6 @@ class placement::keystone::authtoken(
|
|||||||
manage_memcache_package => $manage_memcache_package,
|
manage_memcache_package => $manage_memcache_package,
|
||||||
region_name => $region_name,
|
region_name => $region_name,
|
||||||
token_cache_time => $token_cache_time,
|
token_cache_time => $token_cache_time,
|
||||||
|
service_token_roles_required => $service_token_roles_required,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -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.
|
@@ -40,6 +40,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/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/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/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||||
|
is_expected.to contain_placement_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -78,6 +79,7 @@ describe 'placement::keystone::authtoken' do
|
|||||||
:manage_memcache_package => true,
|
:manage_memcache_package => true,
|
||||||
:region_name => 'region2',
|
:region_name => 'region2',
|
||||||
:token_cache_time => '301',
|
:token_cache_time => '301',
|
||||||
|
:service_token_roles_required => false,
|
||||||
})
|
})
|
||||||
end
|
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/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/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/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') }
|
it { is_expected.to contain_package('python-memcache') }
|
||||||
|
Reference in New Issue
Block a user