summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-08 09:11:04 +0000
committerGerrit Code Review <review@openstack.org>2016-03-08 09:11:05 +0000
commitbb05fa304a2eed2caa4840e8039832d369a357f7 (patch)
treeba9a0045685cf37446f7fc167df4f6aa0582000e /puppet/manifests
parent700d65fe7625b191f405a595b108cdeae18abe86 (diff)
parentc0f8a2aad6e694c14dcdafb6e4d3c450e9a50000 (diff)
Merge "Fixup the memcached servers string in nova.conf for v6"
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp9
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 5e5ecdc1..4ee2fc9e 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -628,8 +628,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