nonha: fix memcached servers string in nova.conf for ipv6

Full context is described here:
https://review.openstack.org/#/c/270110/

The patch that was supposed to fix [1] was not fixing non-ha scenario.
[1] https://launchpad.net/bugs/1536103

This patch aims to fix it.

Change-Id: Iaf4608de1894ce03f35925939e83230abb9f5207
Closes-Bug: #1560063
(cherry picked from commit 99c3db0ea1)
This commit is contained in:
Emilien Macchi 2016-03-21 14:42:52 -04:00
parent b8721e51e7
commit 2bd0d3d18c
1 changed files with 8 additions and 1 deletions

View File

@ -262,8 +262,15 @@ if hiera('step') >= 3 {
include ::glance::notify::rabbitmq
include join(['::glance::backend::', $glance_backend])
$nova_ipv6 = hiera('nova::use_ipv6', false)
if $nova_ipv6 {
$memcached_servers = suffix(hiera('memcache_node_ips_v6'), ':11211')
} else {
$memcached_servers = suffix(hiera('memcache_node_ips'), ':11211')
}
class { '::nova' :
memcached_servers => suffix(hiera('memcache_node_ips'), ':11211'),
memcached_servers => $memcached_servers
}
include ::nova::config
include ::nova::api