From 779162c884a040c4da7891d57abc62716a073dde Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 29 Nov 2018 00:12:07 +0100
Subject: [PATCH] Remove auth_uri

Change-Id: Id89177db73608736f5cea0e8146ed4dd12c199b3
---
 manifests/api.pp                                  |  5 ++---
 manifests/api/authtoken.pp                        | 15 +--------------
 manifests/registry/authtoken.pp                   | 15 +--------------
 .../notes/remove-auth-uri-d5ec1ba55c15ff74.yaml   |  4 ++++
 4 files changed, 8 insertions(+), 31 deletions(-)
 create mode 100644 releasenotes/notes/remove-auth-uri-d5ec1ba55c15ff74.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index 1bd4ff38..98360b03 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -566,12 +566,11 @@ class glance::api(
     $keystone_project_name = $::glance::api::authtoken::project_name
     $keystone_username     = $::glance::api::authtoken::username
     $keystone_password     = $::glance::api::authtoken::password
-    # TODO(tobasco): Remove pick when auth_uri is removed.
-    $auth_uri              = pick($::glance::api::authtoken::auth_uri, $::glance::api::authtoken::www_authenticate_uri)
+    $auth_url              = $::glance::api::authtoken::www_authenticate_uri
     $defaults = {
       'glance-api' => {
         # lint:ignore:140chars
-        'command'  => "glance --os-auth-url ${auth_uri} --os-project-name ${keystone_project_name} --os-username ${keystone_username} --os-password ${keystone_password} image-list",
+        'command'  => "glance --os-auth-url ${auth_url} --os-project-name ${keystone_project_name} --os-username ${keystone_username} --os-password ${keystone_password} image-list",
         # lint:endignore
       }
     }
diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp
index ba281b34..58ed84cd 100644
--- a/manifests/api/authtoken.pp
+++ b/manifests/api/authtoken.pp
@@ -178,12 +178,6 @@
 #   (in seconds). Set to -1 to disable caching completely. Integer value
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*auth_uri*]
-#   (Optional) Complete public Identity API endpoint.
-#   Defaults to undef
-#
 class glance::api::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -219,8 +213,6 @@ class glance::api::authtoken(
   $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $auth_uri                       = undef,
 ) {
 
   include ::glance::deps
@@ -229,17 +221,12 @@ class glance::api::authtoken(
     fail('Please set password for Glance 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)
-
   keystone::resource::authtoken { 'glance_api_config':
       username                       => $username,
       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/manifests/registry/authtoken.pp b/manifests/registry/authtoken.pp
index 7f5474eb..05d39df5 100644
--- a/manifests/registry/authtoken.pp
+++ b/manifests/registry/authtoken.pp
@@ -178,12 +178,6 @@
 #   (in seconds). Set to -1 to disable caching completely. Integer value
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*auth_uri*]
-#   (Optional) Complete public Identity API endpoint.
-#   Defaults to undef
-#
 class glance::registry::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -219,8 +213,6 @@ class glance::registry::authtoken(
   $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $auth_uri                       = undef,
 ) {
 
   include ::glance::deps
@@ -229,17 +221,12 @@ class glance::registry::authtoken(
     fail('Please set password for Glance 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)
-
   keystone::resource::authtoken { 'glance_registry_config':
       username                       => $username,
       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-d5ec1ba55c15ff74.yaml b/releasenotes/notes/remove-auth-uri-d5ec1ba55c15ff74.yaml
new file mode 100644
index 00000000..b3e37197
--- /dev/null
+++ b/releasenotes/notes/remove-auth-uri-d5ec1ba55c15ff74.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The deprecated parameter auth_uri is now removed, please use www_authenticate_uri.