Add support for the keystone_authtoken/service_type parameter
Change-Id: I2ed8dfabd6e99c468456cca960996d9adc3b8f9c
This commit is contained in:
parent
1d848e5aa0
commit
da99cfcbd5
@ -177,6 +177,11 @@
|
|||||||
# true/false
|
# true/false
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
#
|
#
|
||||||
|
# [*service_type*]
|
||||||
|
# (Optional) The name or type of the service as it appears in the service
|
||||||
|
# catalog. This is used to validate tokens that have restricted access rules.
|
||||||
|
# Defaults to $::os_service_default.
|
||||||
|
#
|
||||||
# [*interface*]
|
# [*interface*]
|
||||||
# (Optional) Interface to use for the Identity API endpoint. Valid values are
|
# (Optional) Interface to use for the Identity API endpoint. Valid values are
|
||||||
# "public", "internal" or "admin".
|
# "public", "internal" or "admin".
|
||||||
@ -221,6 +226,7 @@ class nova::keystone::authtoken(
|
|||||||
$token_cache_time = $::os_service_default,
|
$token_cache_time = $::os_service_default,
|
||||||
$service_token_roles = $::os_service_default,
|
$service_token_roles = $::os_service_default,
|
||||||
$service_token_roles_required = $::os_service_default,
|
$service_token_roles_required = $::os_service_default,
|
||||||
|
$service_type = $::os_service_default,
|
||||||
$interface = $::os_service_default,
|
$interface = $::os_service_default,
|
||||||
$params = {},
|
$params = {},
|
||||||
) {
|
) {
|
||||||
@ -269,6 +275,7 @@ class nova::keystone::authtoken(
|
|||||||
token_cache_time => $token_cache_time,
|
token_cache_time => $token_cache_time,
|
||||||
service_token_roles => $service_token_roles,
|
service_token_roles => $service_token_roles,
|
||||||
service_token_roles_required => $service_token_roles_required,
|
service_token_roles_required => $service_token_roles_required,
|
||||||
|
service_type => $service_type,
|
||||||
interface => $interface;
|
interface => $interface;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,5 @@
|
|||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``nova::keystone::authtoken::service_type`` parameter has been
|
||||||
|
added to configure the service_type parameter in authtoken middleware.
|
@ -44,6 +44,7 @@ describe 'nova::keystone::authtoken' do
|
|||||||
is_expected.to contain_nova_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
||||||
|
is_expected.to contain_nova_config('keystone_authtoken/service_type').with_value('<SERVICE DEFAULT>')
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
|
is_expected.to contain_nova_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -85,8 +86,8 @@ describe 'nova::keystone::authtoken' do
|
|||||||
:token_cache_time => '301',
|
:token_cache_time => '301',
|
||||||
:service_token_roles => ['service'],
|
:service_token_roles => ['service'],
|
||||||
:service_token_roles_required => true,
|
:service_token_roles_required => true,
|
||||||
|
:service_type => 'identity',
|
||||||
:interface => 'internal',
|
:interface => 'internal',
|
||||||
:params => { 'service_type' => "compute" },
|
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -125,7 +126,7 @@ describe 'nova::keystone::authtoken' do
|
|||||||
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
|
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
|
is_expected.to contain_nova_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/interface').with_value(params[:interface])
|
is_expected.to contain_nova_config('keystone_authtoken/interface').with_value(params[:interface])
|
||||||
is_expected.to contain_nova_config('keystone_authtoken/service_type').with_value(params[:params]['service_type'])
|
is_expected.to contain_nova_config('keystone_authtoken/service_type').with_value(params[:service_type])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'installs python memcache package' do
|
it 'installs python memcache package' do
|
||||||
@ -137,7 +138,7 @@ describe 'nova::keystone::authtoken' do
|
|||||||
before do
|
before do
|
||||||
params.merge!({
|
params.merge!({
|
||||||
:username => 'myuser',
|
:username => 'myuser',
|
||||||
:params => { 'username' => "myotheruser" },
|
:params => { 'username' => 'myotheruser' },
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user