openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove all hieradata overriding for undercloud memcache

Browse Source 
Now puppet-tripleo is responsible to set memcache for caching, we can
remove uselsess hieradata overriding in the undercloud environment
file.

Depends-on: https://review.opendev.org/#/c/715582/
Change-Id: I20ebe407a362e939fbda7a511de287cbe46a0ef9
This commit is contained in:
Takashi Kajinami 2020-03-28 10:23:27 +09:00
parent 60b2d3ef39
commit cec4048d15
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
environments/undercloud.yaml
View File

@ -205,24 +205,3 @@ parameter_defaults:
# https://bugs.launchpad.net/tripleo/+bug/1791238
KeepalivedRestart: true
SshFirewallAllowAll: true
UndercloudExtraConfig:
aodh::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
cinder::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
glance::api::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
gnocchi::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
heat::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
heat::cache::memcache_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
ironic::api::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
ironic::inspector::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
keystone::cache_memcache_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
keystone::cache_backend: "dogpile.cache.memcached"
mistral::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
neutron::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
nova::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
nova::cache::memcache_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
nova::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
placement::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
swift::proxy::authtoken::memcache_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
swift::proxy::cache::memcache_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
zaqar::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
swift::objectexpirer::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"

3
sample-env-generator/undercloud-minion.yaml
View File

@ -32,9 +32,6 @@ environments:
SshFirewallAllowAll: true
HeatEngineOptVolumes:
- /usr/lib/heat:/usr/lib/heat:ro
UndercloudMinionExtraConfig:
heat::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
heat::cache::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
resource_registry:
# this network config is assumed by the tripleo deploy command
OS::TripleO::UndercloudMinion::Net::SoftwareConfig: ../../net-config-undercloud.yaml