From f7771d8ff65924faad4e5914f0db2171db251793 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Tue, 27 Mar 2018 10:33:25 +0800
Subject: [PATCH] Remove deprecated keystone authtoken revocation_cache_time
 option

Change-Id: I9ddf7c50051e24283656107a70ad596765e15e5c
---
 manifests/api/authtoken.pp                        | 15 ---------------
 manifests/registry/authtoken.pp                   | 15 ---------------
 ...cation_cache_time_option-89af492d7e32913e.yaml |  3 +++
 3 files changed, 3 insertions(+), 30 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-89af492d7e32913e.yaml

diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp
index a9d8fc7b..8edecc18 100644
--- a/manifests/api/authtoken.pp
+++ b/manifests/api/authtoken.pp
@@ -178,15 +178,6 @@
 #   (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 glance::api::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -222,8 +213,6 @@ class glance::api::authtoken(
   $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $revocation_cache_time          = undef,
 ) {
 
   include ::glance::deps
@@ -232,10 +221,6 @@ class glance::api::authtoken(
     fail('Please set password for Glance service user')
   }
 
-  if $revocation_cache_time {
-    warning('revocation_cache_time parameter is deprecated, has no effect and will be removed in the future.')
-  }
-
   keystone::resource::authtoken { 'glance_api_config':
       username                       => $username,
       password                       => $password,
diff --git a/manifests/registry/authtoken.pp b/manifests/registry/authtoken.pp
index b21a051b..e672c3fa 100644
--- a/manifests/registry/authtoken.pp
+++ b/manifests/registry/authtoken.pp
@@ -178,15 +178,6 @@
 #   (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 glance::registry::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -222,8 +213,6 @@ class glance::registry::authtoken(
   $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $revocation_cache_time          = undef,
 ) {
 
   include ::glance::deps
@@ -232,10 +221,6 @@ class glance::registry::authtoken(
     fail('Please set password for Glance service user')
   }
 
-  if $revocation_cache_time {
-    warning('revocation_cache_time parameter is deprecated, has no effect and will be removed in the future.')
-  }
-
   keystone::resource::authtoken { 'glance_registry_config':
       username                       => $username,
       password                       => $password,
diff --git a/releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-89af492d7e32913e.yaml b/releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-89af492d7e32913e.yaml
new file mode 100644
index 00000000..e7fe971b
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_keystone_revocation_cache_time_option-89af492d7e32913e.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated keystone::authtoken::revocation_cache_time option has been removed.