From: ZhongShengping <chdzsp@163.com>
Date: Fri, 7 Jul 2017 01:58:16 +0000 (+0800)
Subject: Remove deprecated keystone authtoken signing_dir option
X-Git-Tag: 11.2.0~4
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=df37477dbdb49e962c8d20800a31772ffe2a04ff;p=puppet-modules%2Fpuppet-ceilometer.git

Remove deprecated keystone authtoken signing_dir option

Change-Id: Ib5569de793dd9922c8f723eaadd96aaec8d34beb
---

diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp
index 3acbf64..b26d6de 100644
--- a/manifests/keystone/authtoken.pp
+++ b/manifests/keystone/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 ceilometer::keystone::authtoken(
   $username                       = 'ceilometer',
   $password                       = $::os_service_default,
@@ -227,8 +221,6 @@ class ceilometer::keystone::authtoken(
   $region_name                    = $::os_service_default,
   $revocation_cache_time          = $::os_service_default,
   $token_cache_time               = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $signing_dir                    = undef,
 ) {
 
   include ::ceilometer::deps
@@ -237,10 +229,6 @@ class ceilometer::keystone::authtoken(
     fail('Please set password for ceilometer 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 { 'ceilometer_config':
     username                       => $username,
     password                       => $password,
diff --git a/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-954249754dbb64ab.yaml b/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-954249754dbb64ab.yaml
new file mode 100644
index 0000000..30b68c3
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_keystone_signing_dir_option-954249754dbb64ab.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated keystone authtoken signing_dir option is removed in Pike.