From 4fb1dec3dfd16c680bb9f23124bd3115dfe6348d Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 14 Sep 2017 11:38:55 +0800
Subject: [PATCH] Deprecate revocation_cache_time option

The revocation_cache_time is deprecated for removel because of PKI
token format is no longer supported.
Update warning message and add a release note.

Change-Id: I6edd1bbad778c2a9b44be9bcfc65c978b5e35132
Closes-Bug: #1717144
---
 manifests/keystone/authtoken.pp               | 24 ++++++++++++-------
 ...cache_time_parameter-255ee73006a4dbf4.yaml |  4 ++++
 .../classes/magnum_keystone_authtoken_spec.rb |  3 ---
 3 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/deprecate_revocation_cache_time_parameter-255ee73006a4dbf4.yaml

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 03e8757..6995633 100755
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -168,19 +168,21 @@
 #   (Optional) The region in which the identity server can be found.
 #   Defaults to $::os_service_default.
 #
-# [*revocation_cache_time*]
-#   (Optional) Determines the frequency at which the list of revoked tokens is
-#   retrieved from the Identity service (in seconds). A high number of
-#   revocation events combined with a low cache duration may significantly
-#   reduce performance. Only valid for PKI tokens. Integer value
-#   Defaults to $::os_service_default.
-#
 # [*token_cache_time*]
 #   (Optional) In order to prevent excessive effort spent validating tokens,
 #   the middleware caches previously-seen tokens for a configurable duration
 #   (in seconds). Set to -1 to disable caching completely. Integer value
 #   Defaults to $::os_service_default.
 #
+# DEPRECATED PARAMETERS
+#
+# [*revocation_cache_time*]
+#   (Optional) Determines the frequency at which the list of revoked tokens is
+#   retrieved from the Identity service (in seconds). A high number of
+#   revocation events combined with a low cache duration may significantly
+#   reduce performance. Only valid for PKI tokens. Integer value
+#   Defaults to undef
+#
 class magnum::keystone::authtoken(
   $password,
   $username                       = 'magnum',
@@ -215,12 +217,17 @@ class magnum::keystone::authtoken(
   $memcached_servers              = $::os_service_default,
   $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
-  $revocation_cache_time          = $::os_service_default,
   $token_cache_time               = $::os_service_default,
+  # DEPRECATED PARAMETERS
+  $revocation_cache_time          = undef,
 ) {
 
   include ::magnum::deps
 
+  if $revocation_cache_time {
+    warning('revocation_cache_time parameter is deprecated, has no effect and will be removed in the future.')
+  }
+
   keystone::resource::authtoken { 'magnum_config':
     username                       => $username,
     password                       => $password,
@@ -255,7 +262,6 @@ class magnum::keystone::authtoken(
     memcached_servers              => $memcached_servers,
     manage_memcache_package        => $manage_memcache_package,
     region_name                    => $region_name,
-    revocation_cache_time          => $revocation_cache_time,
     token_cache_time               => $token_cache_time,
   }
 
diff --git a/releasenotes/notes/deprecate_revocation_cache_time_parameter-255ee73006a4dbf4.yaml b/releasenotes/notes/deprecate_revocation_cache_time_parameter-255ee73006a4dbf4.yaml
new file mode 100644
index 0000000..438a913
--- /dev/null
+++ b/releasenotes/notes/deprecate_revocation_cache_time_parameter-255ee73006a4dbf4.yaml
@@ -0,0 +1,4 @@
+---
+deprecations:
+  - revocation_cache_time option is now deprecated for removal, the
+    parameter has no effect.
diff --git a/spec/classes/magnum_keystone_authtoken_spec.rb b/spec/classes/magnum_keystone_authtoken_spec.rb
index 1e8fdfa..3798e92 100755
--- a/spec/classes/magnum_keystone_authtoken_spec.rb
+++ b/spec/classes/magnum_keystone_authtoken_spec.rb
@@ -50,7 +50,6 @@ describe 'magnum::keystone::authtoken' do
         is_expected.to contain_magnum_config('keystone_authtoken/memcache_use_advanced_pool').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_magnum_config('keystone_authtoken/memcached_servers').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_magnum_config('keystone_authtoken/region_name').with_value('<SERVICE DEFAULT>')
-        is_expected.to contain_magnum_config('keystone_authtoken/revocation_cache_time').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_magnum_config('keystone_authtoken/token_cache_time').with_value('<SERVICE DEFAULT>')
       end
     end
@@ -91,7 +90,6 @@ describe 'magnum::keystone::authtoken' do
           :memcached_servers                    => ['memcached01:11211','memcached02:11211'],
           :manage_memcache_package              => true,
           :region_name                          => 'region2',
-          :revocation_cache_time                => '11',
           :token_cache_time                     => '301',
         })
       end
@@ -132,7 +130,6 @@ describe 'magnum::keystone::authtoken' do
         is_expected.to contain_magnum_config('keystone_authtoken/memcache_use_advanced_pool').with_value(params[:memcache_use_advanced_pool])
         is_expected.to contain_magnum_config('keystone_authtoken/memcached_servers').with_value('memcached01:11211,memcached02:11211')
         is_expected.to contain_magnum_config('keystone_authtoken/region_name').with_value(params[:region_name])
-        is_expected.to contain_magnum_config('keystone_authtoken/revocation_cache_time').with_value(params[:revocation_cache_time])
         is_expected.to contain_magnum_config('keystone_authtoken/token_cache_time').with_value(params[:token_cache_time])
       end