Browse Source

Merge "Add support for the interface parameter in authtoken middleware" into stable/train

changes/15/823615/1
Zuul 6 months ago committed by Gerrit Code Review
parent
commit
12564b344b
  1. 7
      manifests/api/authtoken.pp
  2. 7
      manifests/inspector/authtoken.pp
  3. 6
      releasenotes/notes/keystone-authtoken-interface-b0dd654a86c3f262.yaml
  4. 3
      spec/classes/ironic_api_authtoken_spec.rb

7
manifests/api/authtoken.pp

@ -178,6 +178,11 @@
# a future release and should be enabled if possible.
# 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 ironic::api::authtoken(
$username = 'ironic',
$password = $::os_service_default,
@ -213,6 +218,7 @@ class ironic::api::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 ::ironic::deps
@ -256,5 +262,6 @@ class ironic::api::authtoken(
token_cache_time => $token_cache_time,
service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required,
interface => $interface,
}
}

7
manifests/inspector/authtoken.pp

@ -177,6 +177,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 ironic::inspector::authtoken(
$username = 'ironic',
$password = $::os_service_default,
@ -212,6 +217,7 @@ class ironic::inspector::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 ::ironic::deps
@ -255,5 +261,6 @@ class ironic::inspector::authtoken(
token_cache_time => $token_cache_time,
service_token_roles => $service_token_roles,
service_token_roles_required => $service_token_roles_required,
interface => $interface,
}
}

6
releasenotes/notes/keystone-authtoken-interface-b0dd654a86c3f262.yaml

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

3
spec/classes/ironic_api_authtoken_spec.rb

@ -44,6 +44,7 @@ describe 'ironic::api::authtoken' do
is_expected.to contain_ironic_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles_required').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('keystone_authtoken/interface').with_value('<SERVICE DEFAULT>')
end
end
@ -84,6 +85,7 @@ describe 'ironic::api::authtoken' do
:token_cache_time => '301',
:service_token_roles => ['service'],
:service_token_roles_required => true,
:interface => 'internal',
})
end
@ -121,6 +123,7 @@ describe 'ironic::api::authtoken' do
is_expected.to contain_ironic_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles').with_value(params[:service_token_roles])
is_expected.to contain_ironic_config('keystone_authtoken/service_token_roles_required').with_value(params[:service_token_roles_required])
is_expected.to contain_ironic_config('keystone_authtoken/interface').with_value(params[:interface])
end
it 'installs python memcache package' do

Loading…
Cancel
Save