Merge "Remove auth_uri"

This commit is contained in:
Zuul 2018-12-12 02:11:23 +00:00 committed by Gerrit Code Review
commit c34604974e
2 changed files with 5 additions and 11 deletions

View File

@ -163,10 +163,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.
@ -218,7 +214,6 @@ class ceilometer::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,
) {
@ -229,11 +224,6 @@ class ceilometer::keystone::authtoken(
fail('Please set password for ceilometer 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.')
}
@ -247,7 +237,7 @@ class ceilometer::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,

View File

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