Browse Source

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: I494c1e25c98a57b78c779bcd0bf30c92fe70ff0a
(cherry picked from commit 02f935237d)
(cherry picked from commit a0e4625686)
changes/22/820622/1
Lewis Denny 2 years ago committed by Takashi Kajinami
parent
commit
0693547286
  1. 7
      manifests/keystone/authtoken.pp
  2. 5
      releasenotes/notes/keystone-authtoken-interface-3d1e14584c143ef2.yaml
  3. 3
      spec/classes/designate_keystone_authtoken_spec.rb

7
manifests/keystone/authtoken.pp

@ -172,6 +172,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 designate::keystone::authtoken(
$username = 'designate',
$password = $::os_service_default,
@ -206,6 +211,7 @@ class designate::keystone::authtoken(
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
$service_token_roles_required = $::os_service_default,
$interface = $::os_service_default,
) {
include ::designate::deps
@ -248,5 +254,6 @@ class designate::keystone::authtoken(
region_name => $region_name,
token_cache_time => $token_cache_time,
service_token_roles_required => $service_token_roles_required,
interface => $interface,
}
}

5
releasenotes/notes/keystone-authtoken-interface-3d1e14584c143ef2.yaml

@ -0,0 +1,5 @@
---
features:
- |
The new ``designate::keystone::authtoken::interface`` parameter has been added,
which can be used to set the interface parameter in authtoken middleware.

3
spec/classes/designate_keystone_authtoken_spec.rb

@ -43,6 +43,7 @@ describe 'designate::keystone::authtoken' do
is_expected.to contain_designate_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_designate_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -82,6 +83,7 @@ describe 'designate::keystone::authtoken' do
:region_name => 'region2',
:token_cache_time => '301',
:service_token_roles_required => false,
:interface => 'internal',
})
end
@ -118,6 +120,7 @@ describe 'designate::keystone::authtoken' do
is_expected.to contain_designate_config('keystone_authtoken/region_name').with_value(params[:region_name])
is_expected.to contain_designate_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_designate_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_designate_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do

Loading…
Cancel
Save