Remove old authtoken options

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

Change-Id: I4950c5dba0eb257412fe2d2d39f1780b431c05d4

manifests/init.pp

@@ -63,28 +63,6 @@
 #   in the zaqar config.
 #   Defaults to false.
 #
-# = DEPRECATED PARAMETERS
-#
-# [*identity_uri*]
-#   (Optional) DEPRECATED. Use zaqar::keystone::authtoken::auth_url instead.
-#   Defaults to undef
-#
-# [*auth_uri*]
-#   (Optional) DEPRECATED. Use zaqar::keystone::authtoken::auth_uri instead.
-#   Defaults to undef
-#
-# [*admin_user*]
-#   (Optional) DEPRECATED. Use zaqar::keystone::authtoken::username instead.
-#   Defaults to undef
-#
-# [*admin_tenant_name*]
-#   (Optional) DEPRECATED. Use zaqar::keystone::authtoken::project_name instead.
-#   Defaults to undef
-#
-# [*admin_password*]
-#   (Optional) DEPRECATED. Use zaqar::keystone::authtoken::password instead.
-#   Defaults to undef
-#
 class zaqar(
   $auth_strategy          = 'keystone',
   $admin_mode             = $::os_service_default,
@@ -98,39 +76,12 @@ class zaqar(
   $package_name           = $::zaqar::params::package_name,
   $package_ensure         = 'present',
   $purge_config           = false,
-  # Deprecated
-  $identity_uri           = undef,
-  $auth_uri               = undef,
-  $admin_user             = undef,
-  $admin_password         = undef,
-  $admin_tenant_name      = undef,
 ) inherits zaqar::params {
 
   resources { 'zaqar_config':
     purge  => $purge_config,
   }
 
-  if $identity_uri {
-    warning('zaqar::identity_uri is deprecated, use zaqar::keystone::authtoken::auth_url instead')
-  }
-
-  if $auth_uri {
-    warning('zaqar::auth_uri is deprecated, use zaqar::keystone::authtoken::auth_uri instead')
-  }
-
-  if $admin_user {
-    warning('zaqar::admin_user is deprecated, use zaqar::keystone::authtoken::username instead')
-  }
-
-  if $admin_password {
-    warning('zaqar::admin_password is deprecated, use zaqar::keystone::authtoken::password instead')
-  }
-
-  if $admin_tenant_name {
-    warning('zaqar::admin_tenant_name is deprecated, use zaqar::keystone::authtoken::project_name instead')
-  }
-
-
   if $auth_strategy == 'keystone' {
     include ::zaqar::keystone::authtoken
   }

manifests/keystone/authtoken.pp

@@ -109,8 +109,7 @@
 # [*include_service_catalog*]
 #   (Optional) Indicate whether to set the X-Service-Catalog header. If False,
 #   middleware will not ask for service catalog on token validation and will
-#  not
+#   not set the X-Service-Catalog header. Boolean value.
-#  set the X-Service-Catalog header. Boolean value.
 #   Defaults to $::os_service_default.
 #
 # [*keyfile*]
@@ -134,14 +133,12 @@
 #
 # [*memcache_pool_socket_timeout*]
 #   (Optional) Number of seconds a connection to memcached is held unused in
-#  the
+#   the pool before it is closed. Integer value
-#  pool before it is closed. Integer value
 #   Defaults to $::os_service_default.
 #
 # [*memcache_pool_unused_timeout*]
 #   (Optional) Number of seconds a connection to memcached is held unused in
-#  the
+#   the pool before it is closed. Integer value
-#  pool before it is closed. Integer value
 #   Defaults to $::os_service_default.
 #
 # [*memcache_secret_key*]
@@ -151,10 +148,8 @@
 #
 # [*memcache_security_strategy*]
 #   (Optional) If defined, indicate whether token data should be authenticated
-#  or
+#   or authenticated and encrypted. If MAC, token data is authenticated (with
-#  authenticated and encrypted. If MAC, token data is authenticated (with
+#   HMAC) in the cache. If ENCRYPT, token data is encrypted and authenticated in the
-#  HMAC)
-#  in the cache. If ENCRYPT, token data is encrypted and authenticated in the
 #   cache. If the value is not one of these options or empty, auth_token will
 #   raise an exception on initialization.
 #   Defaults to $::os_service_default.
@@ -228,22 +223,16 @@ class zaqar::keystone::authtoken(
   $token_cache_time               = $::os_service_default,
 ) {
 
-  if is_service_default($password) and ! $::zaqar::admin_password {
+  if is_service_default($password) {
     fail('Please set password for Zaqar service user')
   }
 
-  $username_real = pick($::zaqar::admin_user, $username)
-  $password_real = pick($::zaqar::admin_password, $password)
-  $project_name_real = pick($::zaqar::admin_tenant_name, $project_name)
-  $auth_url_real = pick($::zaqar::identity_uri, $auth_url)
-  $auth_uri_real = pick($::zaqar::auth_uri, $auth_uri)
-
   keystone::resource::authtoken { 'zaqar_config':
-    username                       => $username_real,
+    username                       => $username,
-    password                       => $password_real,
+    password                       => $password,
-    project_name                   => $project_name_real,
+    project_name                   => $project_name,
-    auth_url                       => $auth_url_real,
+    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,

releasenotes/notes/remove_old_authtoken_options-af00c2e849bc8aa4.yaml

@@ -0,0 +1,7 @@
+---
+other:
+  - removed deprecated zaqar::admin_user
+  - removed deprecated zaqar::admin_password
+  - removed deprecated zaqar::admin_tenant_name
+  - removed deprecated zaqar::identity_uri
+  - removed deprecated zaqar::auth_uri

spec/classes/zaqar_init_spec.rb

@@ -1,10 +1,13 @@
 require 'spec_helper'
 describe 'zaqar' do
   shared_examples 'zaqar' do
+    let :pre_condition do
+      "class { '::zaqar::keystone::authtoken':
+         password =>'password',
+       }"
+    end
     let :req_params do
-      {
+      {}
-        :admin_password => 'foo',
-      }
     end
 
     describe 'with only required params' do
@@ -34,27 +37,6 @@ describe 'zaqar' do
 
     end
 
-    describe 'with deprecated parameters set' do
-      let :params do
-        req_params.delete(:admin_password)
-        req_params.merge!({
-          'identity_uri'      => 'https://localhost:35357/deprecated',
-          'auth_uri'          => 'https://localhost:5000/deprecated',
-          'admin_user'        => 'dummy',
-          'admin_password'    => 'mypassword',
-          'admin_tenant_name' => 'mytenant',
-        })
-      end
-
-      it 'configures authtoken section' do
-        is_expected.to contain_zaqar_config('keystone_authtoken/auth_url').with(:value => 'https://localhost:35357/deprecated')
-        is_expected.to contain_zaqar_config('keystone_authtoken/auth_uri').with(:value => 'https://localhost:5000/deprecated')
-        is_expected.to contain_zaqar_config('keystone_authtoken/username').with(:value => 'dummy')
-        is_expected.to contain_zaqar_config('keystone_authtoken/password').with(:value => 'mypassword')
-        is_expected.to contain_zaqar_config('keystone_authtoken/project_name').with(:value => 'mytenant')
-      end
-    end
-
     describe 'with custom values' do
       let :params do
         req_params.merge!({

spec/classes/zaqar_server_spec.rb

@@ -4,7 +4,10 @@ describe 'zaqar::server' do
   shared_examples_for 'zaqar::server' do
     describe 'with a zaqar server enabled' do
       let :pre_condition do
-        "class {'::zaqar': admin_password => 'foo'}"
+        "class { '::zaqar::keystone::authtoken':
+           password =>'foo',
+         }
+         class {'::zaqar': }"
       end
 
       it { is_expected.to contain_service(platform_params[:zaqar_service_name]).with(

spec/defines/zaqar_server_instance_spec.rb

@@ -5,7 +5,10 @@ describe 'zaqar::server_instance' do
     let(:title) { '1' }
 
     let :pre_condition do
-      "class { 'zaqar': admin_password => 'foo' }"
+      "class { '::zaqar::keystone::authtoken':
+         password =>'foo',
+       }
+       class {'::zaqar': }"
     end
 
     let :params do