From 60f3d678d1d328a0db4aab127bd7c7839c7c62bf Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sun, 5 Jul 2020 00:15:18 +0900
Subject: [PATCH] Remove ceilometer::expirer

... because it was deprecated in the previous cycle[1], and is useless
since ceilometer-expirer was removed from ceilometer.

[1] 8a5ec2926068f1d67775fef3eab6a6e39de34a29

Change-Id: I59b78c73f563964030eb2c0602f2a9ddfce3e518
---
 README.md                                     |  1 -
 manifests/expirer.pp                          | 55 -------------------
 .../remove-expirer-8b0054a56d806fc2.yaml      |  4 ++
 3 files changed, 4 insertions(+), 56 deletions(-)
 delete mode 100644 manifests/expirer.pp
 create mode 100644 releasenotes/notes/remove-expirer-8b0054a56d806fc2.yaml

diff --git a/README.md b/README.md
index 3073e7d5..44b30afc 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,6 @@ class { 'ceilometer::keystone::auth':
   password => 'a_big_secret',
 }
 class { 'ceilometer::collector': }
-class { 'ceilometer::expirer': }
 class { 'ceilometer::agent::polling': }
 class { 'ceilometer::agent::notification': }
 class { 'ceilometer::db': }
diff --git a/manifests/expirer.pp b/manifests/expirer.pp
deleted file mode 100644
index 4e19b574..00000000
--- a/manifests/expirer.pp
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
-#
-# Author: Emilien Macchi <emilien.macchi@enovance.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# == Class: ceilometer::expirer
-#
-# DEPRECATED!
-# Setups Ceilometer Expirer service to enable TTL feature.
-#
-# === Parameters
-#
-#  [*enable_cron*]
-#    (optional) Whether to configure a crontab entry to run the expiry.
-#    When set to False, Puppet will try to remove the crontab.
-#    It's useful when we upgrade from Ocata to Pike and want to remove it.
-#    Defaults to undef.
-#
-#  [*minute*]
-#    (optional) Defaults to undef.
-#
-#  [*hour*]
-#    (optional) Defaults to undef.
-#
-#  [*monthday*]
-#    (optional) Defaults to undef.
-#
-#  [*month*]
-#    (optional) Defaults to undef.
-#
-#  [*weekday*]
-#    (optional) Defaults to undef.
-#
-class ceilometer::expirer (
-  $enable_cron = undef,
-  $minute      = undef,
-  $hour        = undef,
-  $monthday    = undef,
-  $month       = undef,
-  $weekday     = undef,
-) {
-  warning('The ceilometer::expirer class is deprecated and has no effect')
-}
diff --git a/releasenotes/notes/remove-expirer-8b0054a56d806fc2.yaml b/releasenotes/notes/remove-expirer-8b0054a56d806fc2.yaml
new file mode 100644
index 00000000..7b950493
--- /dev/null
+++ b/releasenotes/notes/remove-expirer-8b0054a56d806fc2.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ceilometer::expirer class has been removed.