diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index c3e1faf..40e89cd 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -162,10 +162,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. @@ -217,18 +213,12 @@ class ec2api::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, ) { include ::ec2api::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 { warning('check_revocations_for_cached parameter is deprecated, has no effect and will be removed in the future.') } @@ -242,7 +232,7 @@ class ec2api::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, diff --git a/releasenotes/notes/remove-auth-uri-d76aef19e4a2e2e9.yaml b/releasenotes/notes/remove-auth-uri-d76aef19e4a2e2e9.yaml new file mode 100644 index 0000000..b3e3719 --- /dev/null +++ b/releasenotes/notes/remove-auth-uri-d76aef19e4a2e2e9.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.