openstack/puppet-heat
Code Issues Proposed changes

Remove auth_uri

Browse Source 
Change-Id: Ia85a124e9893e3e09c6f41d59090a42050e5c8d0
This commit is contained in:
Tobias Urdin 2018-11-29 00:16:54 +01:00
parent d8e1123122
commit 0c4a5b581a
3 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -412,8 +412,7 @@ class heat(
password => $amqp_password,
}
# TODO(aschultz): remove this after completely switched to www_authenticate_uri
$auth_uri = pick($::heat::keystone::authtoken::auth_uri, $::heat::keystone::authtoken::www_authenticate_uri)
$www_authenticate_uri = $::heat::keystone::authtoken::www_authenticate_uri
$auth_url = $::heat::keystone::authtoken::auth_url
$keystone_username = $::heat::keystone::authtoken::username
$keystone_password = $::heat::keystone::authtoken::password
@ -422,7 +421,7 @@ class heat(
if (defined($heat_clients_keystone_uri)) {
$heat_clients_keystone_uri_real = $heat_clients_keystone_uri
} else {
$heat_clients_keystone_uri_real = $auth_uri
$heat_clients_keystone_uri_real = $www_authenticate_uri
}

12
manifests/keystone/authtoken.pp
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 heat::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 heat::keystone::authtoken(
fail('Please set password for heat 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 heat::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-bfb0a324c5256c6a.yaml Normal file
View File

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