openstack
/
puppet-tripleo
Code Issues Proposed changes

Revert Horizon's Memecached config to use IP addresses 

The library we currently use in Horizon for Memcached, python-memcached,
is unabled to resolve IPv6 domain names, but works fine with IPv6
addresses. Until we switch to a different library, we have to revert
49921d57f5
and use IP addresses.

Conflicts:
	manifests/profile/base/horizon.pp

Change-Id: I1120c81ff3759b3bb344023728c1f695379fd365
(cherry picked from commit 830ae9e5b5)
(cherry picked from commit bdbc4cbcae)
(cherry picked from commit 39327caaa8)
This commit is contained in:
Radomir Dopieralski 2021-10-04 15:04:24 +02:00 committed by Takashi Kajinami
parent 3bc6b25e73
commit 6946b41d45
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/profile/base/horizon.pp
View File

@ -52,15 +52,9 @@
# (Optional) A hash of parameters to enable features specific to Neutron
# Defaults to hiera('horizon::neutron_options', {})
#
# [*memcached_hosts*]
# (Optional) Array of hostnames, ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_names', [])
#
# DEPRECATED PARAMETERS
#
# [*memcached_ips*]
# (Optional) Array of ipv4 or ipv6 addresses for memcache.
# Defaults to undef
# Defaults to hiera('memcached_node_ips', [])
#
# [*heat_api_enabled*]
# (Optional) Indicate whether Heat is available in the deployment.
@ -81,15 +75,11 @@ class tripleo::profile::base::horizon (
$enable_internal_tls = hiera('enable_internal_tls', false),
$horizon_network = hiera('horizon_network', undef),
$neutron_options = hiera('horizon::neutron_options', {}),
$memcached_hosts = hiera('memcached_node_names', []),
$memcached_ips = hiera('memcached_node_ips', []),
$heat_api_enabled = hiera('heat_api_enabled', false),
$octavia_api_enabled = hiera('octavia_api_enabled', false),
$manila_api_enabled = hiera('manila_api_enabled', false),
# DEPRECATED PARAMETERS
$memcached_ips = undef
) {
$memcached_hosts_real = pick($memcached_ips, $memcached_hosts)
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$is_bootstrap = true
} else {
@ -112,10 +102,10 @@ class tripleo::profile::base::horizon (
include tripleo::profile::base::apache
include apache::mod::remoteip
if is_ipv6_address($memcached_hosts_real[0]) {
$horizon_memcached_servers = prefix(any2array(normalize_ip_for_uri($memcached_hosts_real)), 'inet6:')
if is_ipv6_address($memcached_ips[0]) {
$horizon_memcached_servers = prefix(any2array(normalize_ip_for_uri($memcached_ips)), 'inet6:')
} else {
$horizon_memcached_servers = any2array(normalize_ip_for_uri($memcached_hosts_real))
$horizon_memcached_servers = any2array(normalize_ip_for_uri($memcached_ips))
}
class { 'horizon':