diff --git a/examples/cisco_ml2.pp b/examples/cisco_ml2.pp index e31e94c5c..42d7fb3a6 100644 --- a/examples/cisco_ml2.pp +++ b/examples/cisco_ml2.pp @@ -6,8 +6,8 @@ class { '::neutron': } class { '::neutron::server': - auth_uri => 'http://127.0.0.1:5000', - auth_password => 'keystone_secret', + www_authenticate_uri => 'http://127.0.0.1:5000', + auth_password => 'keystone_secret', } class { '::neutron::plugins::ml2': diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 48a90d80d..6ad665563 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -169,10 +169,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. @@ -225,7 +221,6 @@ class neutron::keystone::authtoken( $token_cache_time = $::os_service_default, $service_token_roles_required = $::os_service_default, # DEPRECATED PARAMETERS - $auth_uri = undef, $check_revocations_for_cached = undef, $hash_algorithms = undef, ) { @@ -236,11 +231,6 @@ class neutron::keystone::authtoken( fail('Please set password for neutron 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.') } @@ -254,7 +244,7 @@ class neutron::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-cf6011f3cc813065.yaml b/releasenotes/notes/remove-auth-uri-cf6011f3cc813065.yaml new file mode 100644 index 000000000..b3e371976 --- /dev/null +++ b/releasenotes/notes/remove-auth-uri-cf6011f3cc813065.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.