diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 72244ec2..b40126ef 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -181,6 +181,11 @@ # true/false # 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 cinder::keystone::authtoken( $username = 'cinder', $password = $::os_service_default, @@ -216,6 +221,7 @@ class cinder::keystone::authtoken( $token_cache_time = $::os_service_default, $service_token_roles = $::os_service_default, $service_token_roles_required = $::os_service_default, + $interface = $::os_service_default, ) { include ::cinder::deps @@ -259,5 +265,6 @@ class cinder::keystone::authtoken( token_cache_time => $token_cache_time, service_token_roles => $service_token_roles, service_token_roles_required => $service_token_roles_required, + interface => $interface, } } diff --git a/releasenotes/notes/keystone-authtoken-interface-9da7455a49e59ad7.yaml b/releasenotes/notes/keystone-authtoken-interface-9da7455a49e59ad7.yaml new file mode 100644 index 00000000..08333c9f --- /dev/null +++ b/releasenotes/notes/keystone-authtoken-interface-9da7455a49e59ad7.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + The new ``cinder::keystone::authtoken::interface`` parameter has been + added, which can be used to set the interface parameter in authtoken + middleware. diff --git a/spec/classes/cinder_keystone_authtoken_spec.rb b/spec/classes/cinder_keystone_authtoken_spec.rb index b20121a5..c1e190ac 100644 --- a/spec/classes/cinder_keystone_authtoken_spec.rb +++ b/spec/classes/cinder_keystone_authtoken_spec.rb @@ -43,6 +43,7 @@ describe 'cinder::keystone::authtoken' do is_expected.to contain_cinder_config('keystone_authtoken/token_cache_time').with_value('') is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles').with_value('') is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles_required').with_value('') + is_expected.to contain_cinder_config('keystone_authtoken/interface').with_value('') end end @@ -83,6 +84,7 @@ describe 'cinder::keystone::authtoken' do :token_cache_time => '301', :service_token_roles => ['admin'], :service_token_roles_required => true, + :interface => 'internal', }) end @@ -120,6 +122,7 @@ describe 'cinder::keystone::authtoken' do is_expected.to contain_cinder_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time]) is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles]) is_expected.to contain_cinder_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required]) + is_expected.to contain_cinder_config('keystone_authtoken/interface').with_value(params[:interface]) end it 'installs python memcache package' do