diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 4aa8a283..a4a3fade 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -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 ironic::api::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 ironic::api::authtoken( fail('Please set password for Ironic API 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 ironic::api::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/manifests/inspector/authtoken.pp b/manifests/inspector/authtoken.pp index 0996c899..5ca73e7a 100644 --- a/manifests/inspector/authtoken.pp +++ b/manifests/inspector/authtoken.pp @@ -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 ironic::inspector::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 ironic::inspector::authtoken( fail('Please set password for Ironic Inspector 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 ironic::inspector::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-af09f994994adedd.yaml b/releasenotes/notes/remove-auth-uri-af09f994994adedd.yaml new file mode 100644 index 00000000..b3e37197 --- /dev/null +++ b/releasenotes/notes/remove-auth-uri-af09f994994adedd.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.