From d72f4b7535d9de1b7a366a3bc79eb70f0617d1b4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 17 Jan 2023 14:03:27 +0900
Subject: [PATCH] ceilometer: Remove deprecated group parameter

This parameter was deprecated during the previous cycle[1] and has had
no effect since then.

[1] 152587fd2a1d0c0bc7ad67585fe2ecdd6abde995

Change-Id: I968efcf3e25199f78559d1e1154a19f8772884c7
---
 manifests/proxy/ceilometer.pp                        | 12 ------------
 .../remove-ceilometer-group-268171ee2387e7bd.yaml    |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove-ceilometer-group-268171ee2387e7bd.yaml

diff --git a/manifests/proxy/ceilometer.pp b/manifests/proxy/ceilometer.pp
index 4b8d4bd7..de2f0388 100644
--- a/manifests/proxy/ceilometer.pp
+++ b/manifests/proxy/ceilometer.pp
@@ -151,12 +151,6 @@
 #   (string value)
 #   Defaults to $::os_service_default
 #
-# == DEPRECATED
-#
-# [*group*]
-#   Group name to add to 'swift' user.
-#   Defaults to undef
-#
 # == Examples
 #
 # == Authors
@@ -199,18 +193,12 @@ class swift::proxy::ceilometer(
   $kombu_reconnect_delay              = $::os_service_default,
   $kombu_failover_strategy            = $::os_service_default,
   $kombu_compression                  = $::os_service_default,
-  # DEPRECATED PARAMETERS
-  $group                              = undef,
 ) inherits swift {
 
   include swift::deps
 
   Package['python-ceilometermiddleware'] ~> Service<| title == 'swift-proxy-server' |>
 
-  if $group != undef {
-    warning('The group parameer has been deprecated and has no effect now.')
-  }
-
   if $password == undef {
     warning('Usage of the default password is deprecated and will be removed in a future release. \
 Please set password parameter')
diff --git a/releasenotes/notes/remove-ceilometer-group-268171ee2387e7bd.yaml b/releasenotes/notes/remove-ceilometer-group-268171ee2387e7bd.yaml
new file mode 100644
index 00000000..c66f6258
--- /dev/null
+++ b/releasenotes/notes/remove-ceilometer-group-268171ee2387e7bd.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated ``swift::proxy::ceilometer::group`` parameter has been
+    removed.