diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index e2fcbd35..aaea1b3b 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -182,6 +182,11 @@ # true/false # 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*] # (Optional) Interface to use for the Identity API endpoint. Valid values are # "public", "internal" or "admin". @@ -222,6 +227,7 @@ class trove::keystone::authtoken( $token_cache_time = $::os_service_default, $service_token_roles = $::os_service_default, $service_token_roles_required = $::os_service_default, + $service_type = $::os_service_default, $interface = $::os_service_default, ) { @@ -266,6 +272,7 @@ class trove::keystone::authtoken( token_cache_time => $token_cache_time, service_token_roles => $service_token_roles, service_token_roles_required => $service_token_roles_required, + service_type => $service_type, interface => $interface, } } diff --git a/releasenotes/notes/keystone-authtoken-service_type-839ae99f7083eacb.yaml b/releasenotes/notes/keystone-authtoken-service_type-839ae99f7083eacb.yaml new file mode 100644 index 00000000..0a7af696 --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-service_type-839ae99f7083eacb.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``trove::keystone::authtoken::service_type`` parameter has been + added to configure the service_type parameter in authtoken middleware. diff --git a/spec/classes/trove_keystone_authtoken_spec.rb b/spec/classes/trove_keystone_authtoken_spec.rb index dc483f80..2e8a4dc9 100644 --- a/spec/classes/trove_keystone_authtoken_spec.rb +++ b/spec/classes/trove_keystone_authtoken_spec.rb @@ -46,6 +46,7 @@ describe 'trove::keystone::authtoken' do :token_cache_time => '', :service_token_roles => '', :service_token_roles_required => '', + :service_type => '', :interface => '', ) end @@ -88,6 +89,7 @@ describe 'trove::keystone::authtoken' do :token_cache_time => '301', :service_token_roles => ['service'], :service_token_roles_required => false, + :service_type => 'identity', :interface => 'internal', }) end @@ -128,6 +130,7 @@ describe 'trove::keystone::authtoken' do :token_cache_time => '301', :service_token_roles => ['service'], :service_token_roles_required => false, + :service_type => 'identity', :interface => 'internal', ) end