openstack
/
puppet-cloudkitty
Code Issues Proposed changes

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: I2dad56c1d3fdeca153df9a18c7ef4174b3a20848
This commit is contained in:
Lewis Denny 2020-07-15 15:50:23 +10:00
parent 306badcca1
commit ecce4a20fd
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/keystone/authtoken.pp
View File

@ -166,6 +166,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 cloudkitty::keystone::authtoken(
$password,
$username = 'cloudkitty',
@ -200,6 +205,7 @@ class cloudkitty::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 cloudkitty::deps
@ -238,6 +244,7 @@ class cloudkitty::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-77090a8be3a4b464.yaml Normal file
View File

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

3
spec/classes/cloudkitty_keystone_authtoken_spec.rb
View File

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