From a20047d79578afd826b5436f278088ca964b2f11 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sat, 20 Apr 2024 22:30:41 +0900
Subject: [PATCH] Drop clean-up of [DEFAULT] tenant_name_discovery

The option should be purged when a deployment is upgraded to 2024.1
(or created from scratch).

Change-Id: I9210cdffccdd36b12c5a8a1a5a13a6d2d78396db
---
 manifests/agent/polling.pp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 707d76d4..3bf8bd57 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -212,11 +212,6 @@ class ceilometer::agent::polling (
     'polling/tenant_name_discovery': value => $tenant_name_discovery;
   }
 
-  # TODO(tkajinam): Remove this after 2024.1 release
-  ceilometer_config {
-    'DEFAULT/tenant_name_discovery': ensure => absent;
-  }
-
   if $manage_service {
     if $enabled {
       $service_ensure = 'running'