diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 23e8f07c..6d0dc0a4 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -177,6 +177,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". @@ -217,6 +222,7 @@ class glance::api::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, ) { @@ -261,6 +267,7 @@ class glance::api::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-e22ec47ac8d7f6a0.yaml b/releasenotes/notes/keystone-authtoken-service_type-e22ec47ac8d7f6a0.yaml new file mode 100644 index 00000000..7b8d34e9 --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-service_type-e22ec47ac8d7f6a0.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + The new ``glance::api::authtoken::service_type`` parameter has been + added to configure the service_type parameter in authtoken middleware. diff --git a/spec/classes/glance_api_authtoken_spec.rb b/spec/classes/glance_api_authtoken_spec.rb index 590a1618..e1b016b1 100644 --- a/spec/classes/glance_api_authtoken_spec.rb +++ b/spec/classes/glance_api_authtoken_spec.rb @@ -44,6 +44,7 @@ describe 'glance::api::authtoken' do is_expected.to contain_glance_api_config('keystone_authtoken/token_cache_time').with_value('') is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles').with_value('') is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles_required').with_value('') + is_expected.to contain_glance_api_config('keystone_authtoken/service_type').with_value('') is_expected.to contain_glance_api_config('keystone_authtoken/interface').with_value('') end end @@ -85,6 +86,7 @@ describe 'glance::api::authtoken' do :token_cache_time => '301', :service_token_roles => ['service'], :service_token_roles_required => false, + :service_type => 'identity', :interface => 'internal', }) end @@ -123,6 +125,7 @@ describe 'glance::api::authtoken' do is_expected.to contain_glance_api_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_glance_api_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) + is_expected.to contain_glance_api_config('keystone_authtoken/service_type').with_value(params[:service_type]) is_expected.to contain_glance_api_config('keystone_authtoken/interface').with_value(params[:interface]) end