From f42458bfe61cc6d4b5a4a184ace5a82003b0fb04 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Wed, 17 Aug 2022 08:54:12 +0900
Subject: [PATCH] Remove deprecated notificaton_workers

... because the parameter was deprecated during Wallaby cycle[1] in
favor of the new workers parameter.

[1] 15921006c595ff705be40c02d324a387c92a4339

Change-Id: I787bbe850cfcca737b9ad9de5db676b868549f2e
---
 manifests/agent/notification.pp                 | 17 +----------------
 ...e-notification_workers-1d9ec9ec4b378498.yaml |  5 +++++
 2 files changed, 6 insertions(+), 16 deletions(-)
 create mode 100644 releasenotes/notes/remove-notification_workers-1d9ec9ec4b378498.yaml

diff --git a/manifests/agent/notification.pp b/manifests/agent/notification.pp
index 3b10c8f..e417ef6 100644
--- a/manifests/agent/notification.pp
+++ b/manifests/agent/notification.pp
@@ -83,12 +83,6 @@
 #   Defaults to ['gnocchi://'], If you are using collector
 #   override this to notifier:// instead.
 #
-# DEPRECATED PARAMETERS
-#
-# [*notification_workers*]
-#   (Optional) Number of workers for notification service (integer value).
-#   Defaults to $::os_service_default.
-#
 class ceilometer::agent::notification (
   $manage_service            = true,
   $enabled                   = true,
@@ -103,20 +97,11 @@ class ceilometer::agent::notification (
   $manage_pipeline           = false,
   $pipeline_publishers       = ['gnocchi://'],
   $pipeline_config           = undef,
-  # DEPRECATED PARAMETERS
-  $notification_workers      = undef,
 ) {
 
   include ceilometer::deps
   include ceilometer::params
 
-  if $notification_workers != undef {
-    warning('The notification_workers parameter is deprecated. Use the workers parameter instead')
-    $workers_real = $notification_workers
-  } else {
-    $workers_real = $workers
-  }
-
   package { 'ceilometer-notification':
     ensure => $package_ensure,
     name   => $::ceilometer::params::agent_notification_package_name,
@@ -185,7 +170,7 @@ class ceilometer::agent::notification (
   ceilometer_config {
     'notification/ack_on_event_error'       : value => $ack_on_event_error;
     'notification/disable_non_metric_meters': value => $disable_non_metric_meters;
-    'notification/workers'                  : value => $workers_real;
+    'notification/workers'                  : value => $workers;
     'notification/messaging_urls'           : value => $messaging_urls, secret => true;
   }
 }
diff --git a/releasenotes/notes/remove-notification_workers-1d9ec9ec4b378498.yaml b/releasenotes/notes/remove-notification_workers-1d9ec9ec4b378498.yaml
new file mode 100644
index 0000000..e73ebd7
--- /dev/null
+++ b/releasenotes/notes/remove-notification_workers-1d9ec9ec4b378498.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``ceilometer::agent::notification::notification_workers`` parameter has
+    been removed.
-- 
2.45.2