From 0c4a5b581aaed019253e221200709575e39c3b99 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 29 Nov 2018 00:16:54 +0100
Subject: [PATCH] Remove auth_uri

Change-Id: Ia85a124e9893e3e09c6f41d59090a42050e5c8d0
---
 manifests/init.pp                                    |  5 ++---
 manifests/keystone/authtoken.pp                      | 12 +-----------
 .../notes/remove-auth-uri-bfb0a324c5256c6a.yaml      |  4 ++++
 3 files changed, 7 insertions(+), 14 deletions(-)
 create mode 100644 releasenotes/notes/remove-auth-uri-bfb0a324c5256c6a.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index c71929b4..39fc6305 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -412,8 +412,7 @@ class heat(
     password               => $amqp_password,
   }
 
-  # TODO(aschultz): remove this after completely switched to www_authenticate_uri
-  $auth_uri = pick($::heat::keystone::authtoken::auth_uri, $::heat::keystone::authtoken::www_authenticate_uri)
+  $www_authenticate_uri = $::heat::keystone::authtoken::www_authenticate_uri
   $auth_url = $::heat::keystone::authtoken::auth_url
   $keystone_username = $::heat::keystone::authtoken::username
   $keystone_password = $::heat::keystone::authtoken::password
@@ -422,7 +421,7 @@ class heat(
   if (defined($heat_clients_keystone_uri)) {
     $heat_clients_keystone_uri_real = $heat_clients_keystone_uri
   } else {
-    $heat_clients_keystone_uri_real = $auth_uri
+    $heat_clients_keystone_uri_real = $www_authenticate_uri
   }
 
 
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index ff217aaa..552f8e86 100644
--- 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 heat::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 heat::keystone::authtoken(
     fail('Please set password for heat 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 heat::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-bfb0a324c5256c6a.yaml b/releasenotes/notes/remove-auth-uri-bfb0a324c5256c6a.yaml
new file mode 100644
index 00000000..b3e37197
--- /dev/null
+++ b/releasenotes/notes/remove-auth-uri-bfb0a324c5256c6a.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.