From f633cefe93d56665aaf205a784ada7db31931614 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Fri, 26 Sep 2025 21:19:31 +0900
Subject: [PATCH] Remove tenant_name_discovery

It was deprecated during the 2025.1 cycle.

Change-Id: I13a2da715ec364e115e466324ff4958650313723
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/agent/polling.pp                     | 18 +-----------------
 ...tenant_name_discovery-33509e37189a30ab.yaml |  5 +++++
 2 files changed, 6 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/remove-tenant_name_discovery-33509e37189a30ab.yaml

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 4be32167..357d3b0b 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -123,12 +123,6 @@
 #   (Optional) List of directories with YAML files used to create pollsters.
 #   Defaults to $facts['os_service_default'].
 #
-# DEPRECATED PARAMETERS
-#
-# [*tenant_name_discovery*]
-#   (Optional) Identify user and project names from polled metrics.
-#   Defaults to undef
-#
 class ceilometer::agent::polling (
   Boolean $manage_service                 = true,
   Boolean $enabled                        = true,
@@ -156,20 +150,10 @@ class ceilometer::agent::polling (
   $prometheus_tls_certfile                = $facts['os_service_default'],
   $prometheus_tls_keyfile                 = $facts['os_service_default'],
   $pollsters_definitions_dirs             = $facts['os_service_default'],
-  # DEPRECATED PARAMETERS
-  $tenant_name_discovery                  = undef,
 ) inherits ceilometer {
   include ceilometer::deps
   include ceilometer::params
 
-  if $tenant_name_discovery != undef {
-    warning("The tenant_name_discovery parameter is deprecated. \
-Use the identity_name_discovery parameter instead.")
-    $identity_name_discovery_real = $tenant_name_discovery
-  } else {
-    $identity_name_discovery_real = $identity_name_discovery
-  }
-
   if $central_namespace {
     $central_namespace_name = 'central'
   } else {
@@ -274,7 +258,7 @@ Use the identity_name_discovery parameter instead.")
 
   ceilometer_config {
     'polling/batch_size':                  value => $batch_size;
-    'polling/identity_name_discovery':     value => $identity_name_discovery_real;
+    'polling/identity_name_discovery':     value => $identity_name_discovery;
     'polling/ignore_disabled_projects':    value => $ignore_disabled_projects;
     'polling/pollsters_definitions_dirs':  value => join(any2array($pollsters_definitions_dirs), ',');
     'polling/enable_notifications':        value => $enable_notifications;
diff --git a/releasenotes/notes/remove-tenant_name_discovery-33509e37189a30ab.yaml b/releasenotes/notes/remove-tenant_name_discovery-33509e37189a30ab.yaml
new file mode 100644
index 00000000..92a73591
--- /dev/null
+++ b/releasenotes/notes/remove-tenant_name_discovery-33509e37189a30ab.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``ceilometer::agent::polling::tenant_name_discovery`` parameter has
+    been removed.