From 1d4911be483ddc314f6ea3e826f1aa819fcc4bec Mon Sep 17 00:00:00 2001
From: zhangyangyang <zhangyangyang@unionpay.com>
Date: Fri, 6 Oct 2017 13:26:58 +0800
Subject: [PATCH] Remove revocation_cache_time parameter

revocation_cache_time parameter is deprecated,
has no effect and will be removed in the future.

Change-Id: I279c2fbba52be1e3860544f8b8b3738bddf5e72d
---
 manifests/metadata/novajoin/authtoken.pp          | 15 ---------------
 ...ve_revocation_cache_time-9acf28ac1fd14e83.yaml |  5 +++++
 2 files changed, 5 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/remove_revocation_cache_time-9acf28ac1fd14e83.yaml

diff --git a/manifests/metadata/novajoin/authtoken.pp b/manifests/metadata/novajoin/authtoken.pp
index 7841444f3..4889787cb 100644
--- a/manifests/metadata/novajoin/authtoken.pp
+++ b/manifests/metadata/novajoin/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 nova::metadata::novajoin::authtoken(
   $username                       = 'novajoin',
   $password                       = $::os_service_default,
@@ -222,18 +213,12 @@ class nova::metadata::novajoin::authtoken(
   $manage_memcache_package        = false,
   $region_name                    = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $revocation_cache_time          = undef,
 ) {
 
   if is_service_default($password) {
     fail('Please set password for novajoin 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 { 'novajoin_config':
     username                       => $username,
     password                       => $password,
diff --git a/releasenotes/notes/remove_revocation_cache_time-9acf28ac1fd14e83.yaml b/releasenotes/notes/remove_revocation_cache_time-9acf28ac1fd14e83.yaml
new file mode 100644
index 000000000..6d3fd392d
--- /dev/null
+++ b/releasenotes/notes/remove_revocation_cache_time-9acf28ac1fd14e83.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - remove revocation_cache_time parameter
+    revocation_cache_time parameter is deprecated, has no effect
+    and will be removed in the future.