From e869005e6abf7dfa602f81a00059672ae87ea2c5 Mon Sep 17 00:00:00 2001
From: Yaguang Tang <tangyg2@lenovo.com>
Date: Mon, 3 Jul 2017 21:58:49 +0800
Subject: [PATCH] Remove deprecated keystone authtoken signing_dir option

Change-Id: I3f8093508d12abb640711e79301b301eb2e9de96
---
 manifests/keystone/authtoken.pp                        | 10 ----------
 ...d_keystone_signing_dir_option-e545c1de128ea8a1.yaml |  3 +++
 2 files changed, 3 insertions(+), 10 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_keystone_signing_dir_option-e545c1de128ea8a1.yaml

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index dc054baf6..e2db1a0f5 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/authtoken.pp
@@ -185,11 +185,6 @@
 #   (in seconds). Set to -1 to disable caching completely. Integer value
 #   Defaults to $::os_service_default.
 #
-# DEPRECATED PARAMETERS
-#
-# [*signing_dir*]
-#   (Optional) Directory used to cache files related to PKI tokens.
-#   Defaults to undef
 #
 class nova::keystone::authtoken(
   $username                       = 'nova',
@@ -227,17 +222,12 @@ class nova::keystone::authtoken(
   $region_name                    = $::os_service_default,
   $revocation_cache_time          = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $signing_dir                    = undef,
 ) {
 
   if is_service_default($password) {
     fail('Please set password for nova service user')
   }
 
-  if $signing_dir {
-    warning('signing_dir parameter is deprecated, has no effect and will be removed in the P release.')
-  }
 
   keystone::resource::authtoken { 'nova_config':
     username                       => $username,
diff --git a/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-e545c1de128ea8a1.yaml b/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-e545c1de128ea8a1.yaml
new file mode 100644
index 000000000..30b68c319
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-e545c1de128ea8a1.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated keystone authtoken signing_dir option is removed in Pike.