From 29690073697ed43899fb87eada9fddac8ec6d409 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Sat, 5 Jan 2019 21:41:55 +0000
Subject: [PATCH] Revert "Revert "Remove auth_uri""

Merge this revert when [1] is merged and propagated to packages since Mistral will support www_authenticate_uri then. [1]

[1] https://review.openstack.org/#/c/594187

This reverts commit 5a932874744399ce3330b98bb986ba02803d9394.

Change-Id: I2ff34f358dbc056a59f310d203883844f4db54e5
---
 manifests/resource/authtoken.pp                    | 14 +-------------
 .../notes/remove-auth-uri-9cfa0ed6b68486e4.yaml    |  4 ++++
 2 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 releasenotes/notes/remove-auth-uri-9cfa0ed6b68486e4.yaml

diff --git a/manifests/resource/authtoken.pp b/manifests/resource/authtoken.pp
index 30b3aef51..41f2373ea 100644
--- a/manifests/resource/authtoken.pp
+++ b/manifests/resource/authtoken.pp
@@ -204,10 +204,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.
@@ -261,7 +257,6 @@ define keystone::resource::authtoken(
   $manage_memcache_package        = false,
   $service_token_roles_required   = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $auth_uri                       = undef,
   $check_revocations_for_cached   = undef,
   $hash_algorithms                = undef,
 ) {
@@ -269,11 +264,6 @@ define keystone::resource::authtoken(
   include ::keystone::params
   include ::keystone::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('keystone::resource::authtoken::check_revocations_for_cached is deprecated and will be removed')
   }
@@ -317,9 +307,7 @@ define keystone::resource::authtoken(
 
   $keystonemiddleware_options = {
     'keystone_authtoken/auth_section'                   => {'value' => $auth_section},
-    'keystone_authtoken/www_authenticate_uri'           => {'value' => $www_authenticate_uri_real},
-    #TODO(aschultz): needs to be defined until all providers have been cut over
-    'keystone_authtoken/auth_uri'                       => {'value' => $www_authenticate_uri_real},
+    'keystone_authtoken/www_authenticate_uri'           => {'value' => $www_authenticate_uri},
     'keystone_authtoken/auth_type'                      => {'value' => $auth_type},
     'keystone_authtoken/auth_version'                   => {'value' => $auth_version},
     'keystone_authtoken/cache'                          => {'value' => $cache},
diff --git a/releasenotes/notes/remove-auth-uri-9cfa0ed6b68486e4.yaml b/releasenotes/notes/remove-auth-uri-9cfa0ed6b68486e4.yaml
new file mode 100644
index 000000000..b3e371976
--- /dev/null
+++ b/releasenotes/notes/remove-auth-uri-9cfa0ed6b68486e4.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.