Remove auth_uri

Change-Id: I056a47f305aaef68aa6954824d2277c9ef0617d9

manifests/keystone/authtoken.pp

@@ -165,10 +165,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.
@@ -220,7 +216,6 @@ class watcher::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,
 ) {
@@ -233,11 +228,6 @@ class watcher::keystone::authtoken (
 
   validate_string($password)
 
-  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.')
   }
@@ -251,7 +241,7 @@ class watcher::keystone::authtoken (
     username                       => $username,
     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,

releasenotes/notes/remove-auth-uri-cf2fd17d1f66740f.yaml

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