From f28830d5aae8021215026bdf2f63a8713b7deeb1 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Tue, 20 Mar 2018 14:03:51 +0800
Subject: [PATCH] Remove deprecated metering_secret option

Change-Id: I2e3c781fe01b7e2d0eebdde61635362ccbcd749b
---
 manifests/init.pp                             | 22 +------------------
 ...tering_secret_option-2a01c56c1c849f3c.yaml |  3 +++
 2 files changed, 4 insertions(+), 21 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_metering_secret_option-2a01c56c1c849f3c.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index 1c1483f..0033441 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -230,11 +230,6 @@
 #
 #
 # === DEPRECATED PARAMETERS:
-#  [*metering_secret*]
-#   (optional)  Secret key for signing messages.
-#   This option has been renamed to telemetry_secret in Mitaka.
-#   Don't define this if using telemetry_secret.
-#
 # [*alarm_history_time_to_live*]
 #
 # [*rabbit_host*]
@@ -326,7 +321,6 @@ class ceilometer(
   $host                               = $::os_service_default,
   # DEPRECATED PARAMETERS
   $alarm_history_time_to_live         = undef,
-  $metering_secret                    = undef,
   $rabbit_host                        = $::os_service_default,
   $rabbit_port                        = $::os_service_default,
   $rabbit_hosts                       = $::os_service_default,
@@ -341,20 +335,6 @@ class ceilometer(
   include ::ceilometer::logging
   include ::ceilometer::params
 
-  # Cleanup in Ocata.
-  if $telemetry_secret {
-    validate_string($telemetry_secret)
-    if $metering_secret {
-      warning('Both $metering_secret and $telemetry_secret defined, using $telemetry_secret')
-    }
-    $telemetry_secret_real = $telemetry_secret
-  }
-  else {
-    warning('metering_secret has been renamed to telemetry_secret. metering_secret will continue to work until Ocata.')
-    validate_string($metering_secret)
-    $telemetry_secret_real = $metering_secret
-  }
-
   if $alarm_history_time_to_live {
     warning('alarm_history_time_to_live parameter is deprecated. It should be configured for Aodh.')
   }
@@ -451,7 +431,7 @@ please use memcache_servers instead.")
   ceilometer_config {
     'DEFAULT/http_timeout'                : value => $http_timeout;
     'DEFAULT/host'                        : value => $host;
-    'publisher/telemetry_secret'          : value => $telemetry_secret_real, secret => true;
+    'publisher/telemetry_secret'          : value => $telemetry_secret, secret => true;
     'database/event_time_to_live'         : value => $event_time_to_live;
     'database/metering_time_to_live'      : value => $metering_time_to_live;
     'hardware/readonly_user_name'         : value => $snmpd_readonly_username;
diff --git a/releasenotes/notes/remove_deprecated_metering_secret_option-2a01c56c1c849f3c.yaml b/releasenotes/notes/remove_deprecated_metering_secret_option-2a01c56c1c849f3c.yaml
new file mode 100644
index 0000000..3af364c
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_metering_secret_option-2a01c56c1c849f3c.yaml
@@ -0,0 +1,3 @@
+---
+other:
+ - Remove deprecated metering_secret option for ::ceilometer class.
-- 
2.45.2