From 0adfc3d49533a2a359383e846eaa8ca8d4a0b97a Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Fri, 7 Jul 2017 09:58:53 +0800
Subject: [PATCH] Remove deprecated keystone authtoken signing_dir option

Change-Id: I6e6cca651a8b157491cb1c2bde063c56e7c72dcd
---
 manifests/api/authtoken.pp                           | 12 ------------
 manifests/glare/authtoken.pp                         | 12 ------------
 manifests/registry/authtoken.pp                      | 12 ------------
 ...keystone_signing_dir_option-928d7e97d61de301.yaml |  3 +++
 4 files changed, 3 insertions(+), 36 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_keystone_signing_dir_option-928d7e97d61de301.yaml

diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp
index 37f1d523..e974b96b 100644
--- a/manifests/api/authtoken.pp
+++ b/manifests/api/authtoken.pp
@@ -185,12 +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 glance::api::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -227,8 +221,6 @@ class glance::api::authtoken(
   $region_name                    = $::os_service_default,
   $revocation_cache_time          = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $signing_dir                    = undef,
 ) {
 
   include ::glance::deps
@@ -237,10 +229,6 @@ class glance::api::authtoken(
     fail('Please set password for Glance 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 { 'glance_api_config':
       username                       => $username,
       password                       => $password,
diff --git a/manifests/glare/authtoken.pp b/manifests/glare/authtoken.pp
index 0dd506e3..b5e79191 100644
--- a/manifests/glare/authtoken.pp
+++ b/manifests/glare/authtoken.pp
@@ -185,12 +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 glance::glare::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -227,18 +221,12 @@ class glance::glare::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) and $::glance::glare::keystone_password == undef {
     fail('Please set password for Glance 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 { 'glance_glare_config':
       username                       => $username,
       password                       => $password,
diff --git a/manifests/registry/authtoken.pp b/manifests/registry/authtoken.pp
index 58138c63..5e596950 100644
--- a/manifests/registry/authtoken.pp
+++ b/manifests/registry/authtoken.pp
@@ -185,12 +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 glance::registry::authtoken(
   $username                       = 'glance',
   $password                       = $::os_service_default,
@@ -227,8 +221,6 @@ class glance::registry::authtoken(
   $region_name                    = $::os_service_default,
   $revocation_cache_time          = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $signing_dir                    = undef,
 ) {
 
   include ::glance::deps
@@ -237,10 +229,6 @@ class glance::registry::authtoken(
     fail('Please set password for Glance 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 { 'glance_registry_config':
       username                       => $username,
       password                       => $password,
diff --git a/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-928d7e97d61de301.yaml b/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-928d7e97d61de301.yaml
new file mode 100644
index 00000000..30b68c31
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-928d7e97d61de301.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated keystone authtoken signing_dir option is removed in Pike.