openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Switch to use $NETWORK_uri for memcached 

When passing connection string for memcached the
address must be in brackets if IP version 6 is
used. The $NETWORK_uri provides the ip address
with/whithout brackets depending on ip version.

Related-Bug: #1830406
Depends-On: https://review.opendev.org/661221
Depends-On: https://review.opendev.org/661220
Depends-On: https://review.opendev.org/661299
Depends-On: https://review.opendev.org/661136
Change-Id: If4f32d2d591018c71b2dee9c5898a10d78e47c5e
This commit is contained in:
Harald Jensås 2019-05-22 16:51:08 +02:00
parent 0d2f1df7cd
commit 30708633dc
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/memcached/memcached-container-puppet.yaml
View File

@ -94,6 +94,12 @@ outputs:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
memcached::listen_ip_uri:
str_replace:
template:
"%{hiera('$NETWORK_uri')}"
params:
$NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
memcached::max_memory: {get_param: MemcachedMaxMemory}
# https://access.redhat.com/security/cve/cve-2018-1000115
# Only accept TCP to avoid spoofed traffic amplification DoS on UDP.

56
environments/undercloud.yaml
View File

@ -194,31 +194,31 @@ parameter_defaults:
KeepalivedRestart: true
SshFirewallAllowAll: true
UndercloudExtraConfig:
aodh::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
barbican::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
ceilometer::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
cinder::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
congress::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
ec2api::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
glance::api::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
gnocchi::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
heat::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
heat::cache::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
horizon::cache_server_ip: "%{hiera('memcached::listen_ip')}:11211"
ironic::api::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
ironic::inspector::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
keystone::cache_memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
manila::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
manila::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
mistral::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
neutron::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
nova::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
nova::cache::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
nova::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
panko::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
sahara::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
swift::proxy::authtoken::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
swift::proxy::cache::memcache_servers: "%{hiera('memcached::listen_ip')}:11211"
tacker::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
zaqar::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
swift::objectexpirer::memcached_servers: "%{hiera('memcached::listen_ip')}:11211"
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"
ec2api::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"
horizon::cache_server_ip: "%{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"
manila::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
manila::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
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"
panko::keystone::authtoken::memcached_servers: "%{hiera('memcached::listen_ip_uri')}:11211"
sahara::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"
tacker::keystone::authtoken::memcached_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"