Remove auth_uri

Change-Id: I5b88b4c08a4afee39bfec8f22e694e8218b9d2df

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index c894227029e55099e4743d6cb7c5f2c2a28fc439..d3257325854d066af28d00734f731471289140da 100644 (file)
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/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 ceilometer::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 ceilometer::keystone::authtoken(
     fail('Please set password for ceilometer 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 ceilometer::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-4ebe934f0a9388ee.yaml b/releasenotes/notes/remove-auth-uri-4ebe934f0a9388ee.yaml
new file mode 100644 (file)
index 0000000..b3e3719
--- /dev/null
+++ b/releasenotes/notes/remove-auth-uri-4ebe934f0a9388ee.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.