openstack/puppet-glare
Code Issues Proposed changes

Remove auth_uri

Browse Source 
Change-Id: I55c635d22a92c8d923323ba76ebced5033b9205e
This commit is contained in:
Tobias Urdin 2018-11-29 00:12:54 +01:00
parent f67462cce2
commit 3d0a913fcb
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/keystone/authtoken.pp
View File

@ -162,10 +162,6 @@
# #
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*auth_uri*]
# (Optional) Complete public Identity API endpoint.
# Defaults to undef
#
# [*check_revocations_for_cached*] # [*check_revocations_for_cached*]
# (Optional) If true, the revocation list will be checked for cached tokens. # (Optional) If true, the revocation list will be checked for cached tokens.
# This requires that PKI tokens are configured on the identity server. # This requires that PKI tokens are configured on the identity server.
@ -217,18 +213,12 @@ class glare::keystone::authtoken(
$region_name = $::os_service_default, $region_name = $::os_service_default,
$token_cache_time = $::os_service_default, $token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$auth_uri = undef,
$check_revocations_for_cached = undef, $check_revocations_for_cached = undef,
$hash_algorithms = undef, $hash_algorithms = undef,
) { ) {
include ::glare::deps include ::glare::deps
if $auth_uri {
warning('The auth_uri parameter is deprecated. Please use www_authenticate_uri instead.')
}
$www_authenticate_uri_real = pick($auth_uri, $www_authenticate_uri)
if $check_revocations_for_cached { if $check_revocations_for_cached {
warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.') warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.')
} }
@ -242,7 +232,7 @@ class glare::keystone::authtoken(
password => $password, password => $password,
project_name => $project_name, project_name => $project_name,
auth_url => $auth_url, auth_url => $auth_url,
www_authenticate_uri => $www_authenticate_uri_real, www_authenticate_uri => $www_authenticate_uri,
auth_version => $auth_version, auth_version => $auth_version,
auth_type => $auth_type, auth_type => $auth_type,
auth_section => $auth_section, auth_section => $auth_section,

4
releasenotes/notes/remove-auth-uri-40a904451accd58a.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.