From 95a0c8ff3ea72d8d5a2e5c76822ffaafe54f313a Mon Sep 17 00:00:00 2001
From: Alexey Stupnikov <aleksey.stupnikov@gmail.com>
Date: Sun, 21 Mar 2021 15:15:19 +0100
Subject: [PATCH] Remove or fix outdated/incorrect ceilometer hieradata
 definitions

- ceilometer::agent::compute class was removed in Train release.
  ceilometer::agent::polling class should be used instead.
  change: I33c45e1ac69348df3d4f0a0df4561295123bdcce

Partial-Bug: #1916386
Change-Id: I597929128741be97bd859ea76e7f8dd8f7ac19fd
---
 .../ceilometer/ceilometer-agent-compute-container-puppet.yaml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
index 75b9c34307..7df7fd958e 100644
--- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
@@ -70,7 +70,7 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
-          - ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
+          - ceilometer::agent::polling::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
           - ceilometer_redis_password: {get_param: RedisPassword}
             compute_namespace: true
       service_config_settings: