Add support for the interface parameter in authtoken middleware
This patch adds support for [keystone_authtoken] interface parameter, so that operators can define which endpoint should be used by authtoken middleware. Change-Id: I179fa93a0226f982019f2366684aa24b4e6e9a12 (cherry picked from commit6d825ca6fe
) (cherry picked from commit89a24c2001
)
This commit is contained in:
parent
db82fc60d8
commit
914b228944
|
@ -177,6 +177,11 @@
|
||||||
# true/false
|
# true/false
|
||||||
# Defaults to $::os_service_default.
|
# Defaults to $::os_service_default.
|
||||||
#
|
#
|
||||||
|
# [*interface*]
|
||||||
|
# (Optional) Interface to use for the Identity API endpoint. Valid values are
|
||||||
|
# "public", "internal" or "admin".
|
||||||
|
# Defaults to $::os_service_default.
|
||||||
|
#
|
||||||
class neutron::keystone::authtoken(
|
class neutron::keystone::authtoken(
|
||||||
$username = 'neutron',
|
$username = 'neutron',
|
||||||
$password = $::os_service_default,
|
$password = $::os_service_default,
|
||||||
|
@ -212,6 +217,7 @@ class neutron::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,
|
||||||
|
$interface = $::os_service_default,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::neutron::deps
|
include ::neutron::deps
|
||||||
|
@ -255,5 +261,6 @@ class neutron::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,
|
||||||
|
interface => $interface,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``neutron::keystone::authtoken::interface`` parameter has been
|
||||||
|
added, which can be used to set the interface parameter in authtoken
|
||||||
|
middleware.
|
|
@ -41,6 +41,7 @@ describe 'neutron::keystone::authtoken' do
|
||||||
should contain_neutron_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_neutron_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
|
||||||
should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
|
||||||
|
should contain_neutron_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -81,6 +82,7 @@ describe 'neutron::keystone::authtoken' do
|
||||||
:token_cache_time => '301',
|
:token_cache_time => '301',
|
||||||
:service_token_roles => ['service'],
|
:service_token_roles => ['service'],
|
||||||
:service_token_roles_required => false,
|
:service_token_roles_required => false,
|
||||||
|
:interface => 'internal',
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -118,6 +120,7 @@ describe 'neutron::keystone::authtoken' do
|
||||||
should contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
should contain_neutron_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
|
||||||
should contain_neutron_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
|
should contain_neutron_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
|
||||||
should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
|
should contain_neutron_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
|
||||||
|
should contain_neutron_config('keystone_authtoken/interface').with_value(params[:interface])
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'installs python memcache package' do
|
it 'installs python memcache package' do
|
||||||
|
|
Loading…
Reference in New Issue