From 48a1effb1cca772d5cbefbaacc1d5bc90c18efa9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 18 Jan 2020 23:04:35 +0900
Subject: [PATCH] Remove unnecessary hieradata for
 ceilometer::keystone::authtoken

ceilometer::keystone::authtoken module is never loaded, so remove
hieradata related to the module.

Change-Id: I4f89235b15a71435797b070fd664dda1eff0ebfc
---
 .../ceilometer/ceilometer-base-container-puppet.yaml       | 7 -------
 environments/undercloud.yaml                               | 1 -
 2 files changed, 8 deletions(-)

diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
index 8b676300f7..a61c33190f 100644
--- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
@@ -141,13 +141,6 @@ outputs:
               - service_debug_unset
               - {get_param: Debug }
               - {get_param: CeilometerDebug }
-            ceilometer::keystone::authtoken::project_name: 'service'
-            ceilometer::keystone::authtoken::user_domain_name: 'Default'
-            ceilometer::keystone::authtoken::project_domain_name: 'Default'
-            ceilometer::keystone::authtoken::password: {get_param: CeilometerPassword}
-            ceilometer::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
-            ceilometer::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
-            ceilometer::keystone::authtoken::region_name: {get_param: KeystoneRegion}
             ceilometer::agent::auth::auth_password: {get_param: CeilometerPassword}
             ceilometer::agent::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             ceilometer::agent::notification::manage_event_pipeline: {get_param: ManageEventPipeline}
diff --git a/environments/undercloud.yaml b/environments/undercloud.yaml
index e2c946dabe..a900be0132 100644
--- a/environments/undercloud.yaml
+++ b/environments/undercloud.yaml
@@ -208,7 +208,6 @@ parameter_defaults:
   UndercloudExtraConfig:
     aodh::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
     barbican::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
-    ceilometer::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
     cinder::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
     congress::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
     glance::api::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"