From bc47dbcea89a21641401266797635e868f3fcc9c Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <iurygregory@gmail.com>
Date: Tue, 8 Nov 2016 19:50:50 -0300
Subject: [PATCH] Remove old authtoken options

Since we are in ocata lets remove all old parameters in api
to configure the keystone_authtoken section

Change-Id: I4d44e7a6e1623acfd73345e0877a9fcd8f128ca8
---
 manifests/api.pp                              | 34 +------------------
 manifests/keystone/authtoken.pp               |  9 ++---
 ...ld_authtoken_options-bf1cd0acf3f65056.yaml |  5 +++
 3 files changed, 9 insertions(+), 39 deletions(-)
 create mode 100644 releasenotes/notes/remove_old_authtoken_options-bf1cd0acf3f65056.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index d08209e3..124a45bc 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -202,20 +202,6 @@
 #
 # === DEPRECATED PARAMETERS
 #
-# [*keystone_password*]
-#   (optional) DEPRECATED. Use barbican::keystone::authtoken::password
-#   instead.
-#   Defaults to undef
-#
-# [*auth_url*]
-#   (optional) DEPRECATED. Use barbican::keystone::authtoken::auth_url
-#   instead.
-#   Defaults to undef
-#
-# [*auth_type*]
-#   (optional) DEPRECATED. Use auth_strategy instead.
-#   Defaults to undef
-#
 # [*rabbit_host*]
 #   (optional) Location of rabbitmq installation.
 #   Defaults to $::os_service_default
@@ -284,9 +270,6 @@ class barbican::api (
   $service_name                                  = 'barbican-api',
   $enable_proxy_headers_parsing                  = $::os_service_default,
   # DEPRECATED
-  $auth_type                                     = undef,
-  $keystone_password                             = undef,
-  $auth_url                                      = undef,
   $rabbit_host                                   = $::os_service_default,
   $rabbit_hosts                                  = $::os_service_default,
   $rabbit_password                               = $::os_service_default,
@@ -300,21 +283,6 @@ class barbican::api (
   include ::barbican::api::logging
   include ::barbican::client
 
-  if $auth_type {
-    warning('auth_type is deprecated and will be removed, use auth_strategy instead')
-    $auth_strategy_real = $auth_type
-  } else {
-    $auth_strategy_real = $auth_strategy
-  }
-
-  if $keystone_password {
-    warning('keystone_password is deprecated, use barbican::keystone::authtoken::password instead.')
-  }
-
-  if $auth_url {
-    warning('auth_url is deprecated, use barbican::keystone::authtoken::auth_url instead.')
-  }
-
   if !is_service_default($rabbit_host) or
     !is_service_default($rabbit_hosts) or
     !is_service_default($rabbit_password) or
@@ -418,7 +386,7 @@ deprecated. Please use barbican::default_transport_url instead.")
   }
 
   # keystone config
-  if $auth_strategy_real == 'keystone' {
+  if $auth_strategy == 'keystone' {
 
     include ::barbican::keystone::authtoken
 
diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 90b4c0cf..03e18c7c 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -223,18 +223,15 @@ class barbican::keystone::authtoken(
   $token_cache_time               = $::os_service_default,
 ) {
 
-  if is_service_default($password) and ! $::barbican::api::keystone_password {
+  if is_service_default($password) {
     fail('Please set password for barbican service user')
   }
 
-  $password_real = pick($::barbican::api::keystone_password, $password)
-  $auth_url_real = pick($::barbican::api::auth_url, $auth_url)
-
   keystone::resource::authtoken { 'barbican_config':
     username                       => $username,
-    password                       => $password_real,
+    password                       => $password,
     project_name                   => $project_name,
-    auth_url                       => $auth_url_real,
+    auth_url                       => $auth_url,
     auth_uri                       => $auth_uri,
     auth_version                   => $auth_version,
     auth_type                      => $auth_type,
diff --git a/releasenotes/notes/remove_old_authtoken_options-bf1cd0acf3f65056.yaml b/releasenotes/notes/remove_old_authtoken_options-bf1cd0acf3f65056.yaml
new file mode 100644
index 00000000..5c9ba77c
--- /dev/null
+++ b/releasenotes/notes/remove_old_authtoken_options-bf1cd0acf3f65056.yaml
@@ -0,0 +1,5 @@
+---
+other:
+  - removed deprecated barbican::api::keystone_password
+  - removed deprecated barbican::api::auth_url
+  - removed deprecated barbican::api::auth_type