Remove old authtoken options

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

Change-Id: Ie6c09e8d31c93f9fe2df0dad010f768e2498d1a2

manifests/api.pp

@@ -53,50 +53,6 @@
 #
 # === DEPRECATED PARAMTERS
 #
-# [*keystone_enabled*]
-#   (optional) DEPRECATED. Use auth_strategy instead.
-#   Defaults to undef
-#
-# [*keystone_password*]
-#   (optional) DEPRECATED. The password to use for authentication (keystone),
-#   use password from manila::keystone::authtoken instead.
-#   Defaults to undef
-#
-# [*keystone_tenant*]
-#   (optional) DEPRECATED. The tenant of the auth user, use  project_name
-#   from manila::keystone::authtoken instead.
-#   Defaults to undef
-#
-# [*keystone_user*]
-#   (optional) DEPRECATED. The name of the auth user, use username from
-#   manila::keystone::authtoken instead.
-#   Defaults to undef
-#
-# [*keystone_auth_host*]
-#   (optional) DEPRECATED. The keystone host.
-#   Defaults to undef
-#
-# [*keystone_auth_port*]
-#   (optional) DEPRECATED. The keystone auth port.
-#   Defaults to undef
-#
-# [*keystone_auth_protocol*]
-#   (optional) DEPRECATED. The protocol used to access the auth host.
-#   Defaults to undef
-#
-# [*keystone_auth_admin_prefix*]
-#   (optional) DEPRECATED. The admin_prefix used to admin endpoint of the auth host
-#   This allow admin auth URIs like http://auth_host:35357/keystone.
-#   (where '/keystone' is the admin prefix)
-#   Defaults to false for empty. If defined, should be a string with a
-#   leading '/' and no trailing '/'.
-#   Defaults to undef
-#
-# [*keystone_auth_uri*]
-#   (Optional) DEPRECATED. Public Identity API endpoint use auth_uri from
-#   manila::keystone::authtoken instead.
-#   Defaults to undef.
-#
 # [*service_port*]
 #   (optional) DEPRECATED. The manila api port
 #   Defaults to undef
@@ -114,15 +70,6 @@ class manila::api (
   $enable_proxy_headers_parsing = $::os_service_default,
   $enabled_share_protocols      = $::os_service_default,
   # Deprecated
-  $keystone_enabled             = undef,
-  $keystone_user                = undef,
-  $keystone_tenant              = undef,
-  $keystone_auth_uri            = undef,
-  $keystone_password            = undef,
-  $keystone_auth_admin_prefix   = undef,
-  $keystone_auth_host           = undef,
-  $keystone_auth_port           = undef,
-  $keystone_auth_protocol       = undef,
   $service_port                 = undef,
 ) {
 
@@ -130,42 +77,6 @@ class manila::api (
   include ::manila::params
   require ::keystone::python
 
-  if $keystone_enabled {
-    warning('keystone_enabled is deprecated, use auth_strategy instead.')
-  }
-
-  if $keystone_user {
-    warning('manila::api::keystone_user is deprecated, use manila::keystone::authtoken::username instead.')
-  }
-
-  if $keystone_tenant {
-    warning('manila::api::keystone_tenant is deprecated, use manila::keystone::authtoken::project_name instead.')
-  }
-
-  if $keystone_password {
-    warning('manila::api::keystone_password is deprecated, use manila::keystone::authtoken::password instead.')
-  }
-
-  if $keystone_auth_uri {
-    warning('manila::api::keystone_auth_uri is deprecated, use manila::keystone::authtoken::auth_uri instead.')
-  }
-
-  if $keystone_auth_admin_prefix {
-    warning('keystone_auth_admin_prefix is deprecated and will be removed in a future release')
-  }
-
-  if $keystone_auth_host {
-    warning('keystone_auth_host is deprecated and will be removed in a future release')
-  }
-
-  if $keystone_auth_port {
-    warning('keystone_auth_port is deprecated and will be removed in a future release')
-  }
-
-  if $keystone_auth_protocol {
-    warning('keystone_auth_protocol is deprecated and will be removed in a future release')
-  }
-
   if $service_port {
     warning('service port is deprecated and will be removed in a future release')
   }
@@ -220,15 +131,9 @@ class manila::api (
     }
   }
 
-  if $keystone_enabled {
+  if $auth_strategy == 'keystone' {
-    $auth_strategy_real = 'keystone'
-  } else {
-    $auth_strategy_real = $auth_strategy
-  }
-
-  if $auth_strategy_real == 'keystone' {
     manila_config {
-      'DEFAULT/auth_strategy': value => $auth_strategy_real;
+      'DEFAULT/auth_strategy': value => $auth_strategy;
     }
     include ::manila::keystone::authtoken
 

manifests/keystone/authtoken.pp

@@ -223,21 +223,16 @@ class manila::keystone::authtoken(
   $token_cache_time               = $::os_service_default,
 ) {
 
-  if is_service_default($password) and ! $::manila::api::keystone_password {
+  if is_service_default($password) {
     fail('Please set password for manila service user')
   }
 
-  $username_real = pick($::manila::api::keystone_user, $username)
-  $password_real = pick($::manila::api::keystone_password, $password)
-  $project_name_real = pick($::manila::api::keystone_tenant, $project_name)
-  $auth_uri_real = pick($::manila::api::auth_uri, $auth_uri)
-
   keystone::resource::authtoken { 'manila_config':
-    username                       => $username_real,
+    username                       => $username,
-    password                       => $password_real,
+    password                       => $password,
-    project_name                   => $project_name_real,
+    project_name                   => $project_name,
     auth_url                       => $auth_url,
-    auth_uri                       => $auth_uri_real,
+    auth_uri                       => $auth_uri,
     auth_version                   => $auth_version,
     auth_type                      => $auth_type,
     auth_section                   => $auth_section,
@@ -270,4 +265,3 @@ class manila::keystone::authtoken(
     token_cache_time               => $token_cache_time,
   }
 }
-

releasenotes/notes/remove_old_authtoken_options-dc165736e2e8f177.yaml

@@ -0,0 +1,11 @@
+---
+other:
+  - removed deprecated manila::api::keystone_enabled
+  - removed deprecated manila::api::keystone_password
+  - removed deprecated manila::api::keystone_tenant
+  - removed deprecated manila::api::keystone_user
+  - removed deprecated manila::api::keystone_auth_host
+  - removed deprecated manila::api::keystone_auth_port
+  - removed deprecated manila::api::keystone_auth_protocol
+  - removed deprecated manila::api::keystone_auth_admin_prefix
+  - removed deprecated manila::api::keystone_auth_uri

spec/classes/manila_api_spec.rb

@@ -1,10 +1,16 @@
 require 'spec_helper'
 
 describe 'manila::api' do
+  let :pre_condition do
+    "class {'::manila::keystone::authtoken':
+       password => 'foo',
+     }"
+  end
 
   let :req_params do
-    {:keystone_password => 'foo'}
+    {}
   end
+
   let :facts do
     @default_facts.merge({:osfamily => 'Debian'})
   end