openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove unnecessary hieradata for ceilometer::keystone::authtoken"

Browse Source
This commit is contained in:
Zuul 2020-03-10 17:05:08 +00:00 committed by Gerrit Code Review
commit 364a788b7f
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/ceilometer/ceilometer-base-container-puppet.yaml
View File

@ -107,13 +107,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::polling::manage_polling: {get_param: ManagePolling}

1
environments/undercloud.yaml
View File

@ -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"