openstack
/
puppet-trove
Code Issues Proposed changes

Merge "Remove auth_uri"

This commit is contained in:
Zuul 2018-12-10 10:44:37 +00:00 committed by Gerrit Code Review
parent 608b180704 ab83c20ddf
commit d556aace26
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/api.pp
View File

@ -155,9 +155,7 @@ class trove::api(
if $auth_strategy == 'keystone' {
include ::trove::keystone::authtoken
# TODO(tobasco): Remove pick when deprecated auth_url is removed and only use www_authenticate_url
$trove_auth_url_pick = pick($::trove::keystone::authtoken::auth_uri, $::trove::keystone::authtoken::www_authenticate_uri)
$trove_auth_url = "${regsubst($trove_auth_url_pick, '(\/v3$|\/v2.0$|\/$)', '')}/v3"
$trove_auth_url = "${regsubst($::trove::keystone::authtoken::www_authenticate_uri, '(\/v3$|\/v2.0$|\/$)', '')}/v3"
trove_config {
'DEFAULT/trove_auth_url' : value => $trove_auth_url;
}

12
manifests/keystone/authtoken.pp
View File

@ -168,10 +168,6 @@
#
# DEPRECATED PARAMETERS
#
# [*auth_uri*]
# (Optional) Complete public Identity API endpoint.
# Defaults to undef
#
# [*check_revocations_for_cached*]
# (Optional) If true, the revocation list will be checked for cached tokens.
# This requires that PKI tokens are configured on the identity server.
@ -223,7 +219,6 @@ class trove::keystone::authtoken(
$region_name = $::os_service_default,
$token_cache_time = $::os_service_default,
# DEPRECATED PARAMETERS
$auth_uri = undef,
$check_revocations_for_cached = undef,
$hash_algorithms = undef,
) {
@ -234,11 +229,6 @@ class trove::keystone::authtoken(
fail('Please set password for trove service user')
}
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 {
warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.')
}
@ -252,7 +242,7 @@ class trove::keystone::authtoken(
password => $password,
project_name => $project_name,
auth_url => $auth_url,
www_authenticate_uri => $www_authenticate_uri_real,
www_authenticate_uri => $www_authenticate_uri,
auth_version => $auth_version,
auth_type => $auth_type,
auth_section => $auth_section,

4
releasenotes/notes/remove-auth-uri-78dfc3af814c1367.yaml Normal file
View File

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