openstack/puppet-keystone
Code Issues Proposed changes

Revert "Revert "Remove auth_uri""

Browse Source 
Merge this revert when [1] is merged and propagated to packages since Mistral will support www_authenticate_uri then. [1]

[1] https://review.openstack.org/#/c/594187

This reverts commit 5a93287474.

Change-Id: I2ff34f358dbc056a59f310d203883844f4db54e5
This commit is contained in:
Tobias Urdin
2019-01-05 21:41:55 +00:00
parent 5a93287474
commit 2969007369
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifests/resource/authtoken.pp
View File

@@ -204,10 +204,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.
@@ -261,7 +257,6 @@ define keystone::resource::authtoken(
$manage_memcache_package = false, $manage_memcache_package = false,
$service_token_roles_required = $::os_service_default, $service_token_roles_required = $::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,
) { ) {
@@ -269,11 +264,6 @@ define keystone::resource::authtoken(
include ::keystone::params include ::keystone::params
include ::keystone::deps include ::keystone::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('keystone::resource::authtoken::check_revocations_for_cached is deprecated and will be removed') warning('keystone::resource::authtoken::check_revocations_for_cached is deprecated and will be removed')
} }
@@ -317,9 +307,7 @@ define keystone::resource::authtoken(
$keystonemiddleware_options = { $keystonemiddleware_options = {
'keystone_authtoken/auth_section' => {'value' => $auth_section}, 'keystone_authtoken/auth_section' => {'value' => $auth_section},
'keystone_authtoken/www_authenticate_uri' => {'value' => $www_authenticate_uri_real}, 'keystone_authtoken/www_authenticate_uri' => {'value' => $www_authenticate_uri},
#TODO(aschultz): needs to be defined until all providers have been cut over
'keystone_authtoken/auth_uri' => {'value' => $www_authenticate_uri_real},
'keystone_authtoken/auth_type' => {'value' => $auth_type}, 'keystone_authtoken/auth_type' => {'value' => $auth_type},
'keystone_authtoken/auth_version' => {'value' => $auth_version}, 'keystone_authtoken/auth_version' => {'value' => $auth_version},
'keystone_authtoken/cache' => {'value' => $cache}, 'keystone_authtoken/cache' => {'value' => $cache},

4
releasenotes/notes/remove-auth-uri-9cfa0ed6b68486e4.yaml Normal file
View File

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