starlingx
/
config
Code Issues Proposed changes

Set the correct memcached server in puppet ceilometer 

The existing memcached server address configured in puppet ceilometer
cannot be recognized by memcached in an ipv6 system, this causes the
failure of caching ceilometer resource metadata.
This update is to correct the format of memcached server configured in
ceilometer puppet for ipv6 system.

Closes-Bug: 1790662

Change-Id: Icfdcb688cb0740d10c5d970e53564680e75058e9
Signed-off-by: Angie Wang <angie.wang@windriver.com>
This commit is contained in:
Angie Wang 2018-09-10 15:30:56 -04:00
parent 6d3e7e4e98
commit 11fe36dea0
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
puppet-manifests/src/modules/openstack/manifests/ceilometer.pp
View File

@ -87,10 +87,19 @@ class openstack::ceilometer {
if $::personality == 'controller' {
include ::platform::memcached::params
$memcache_ip = $::platform::memcached::params::listen_ip
$memcache_port = $::platform::memcached::params::tcp_port
$memcache_ip_version = $::platform::memcached::params::listen_ip_version
$memcache_servers = $memcache_ip_version ? {
4 => "'$memcache_ip:$memcache_port'",
6 => "'inet6:[$memcache_ip]:$memcache_port'",
}
oslo::cache { 'ceilometer_config':
enabled => true,
backend => 'dogpile.cache.memcached',
memcache_servers => "'${::platform::memcached::params::listen_ip}:${::platform::memcached::params::tcp_port}'",
memcache_servers => $memcache_servers,
expiration_time => 86400,
}
}

2
puppet-manifests/src/modules/platform/manifests/memcached.pp
View File

@ -26,6 +26,8 @@ class platform::memcached::params(
}
}
}
$listen_ip_version = $::platform::network::mgmt::params::subnet_version
}