diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-03-21 14:42:52 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-03-23 14:21:55 +0000 |
| commit | 99c3db0ea146b55005848fd5230ca0bb63874f58 (patch) | |
| tree | dad934fe4aa815dbfcf32f5bc8aca6eb6457dbca /puppet | |
| parent | 1dd6de571c79625ccf5520895b764bb9c2dd75d3 (diff) | |
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
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 5556a40c..78545099 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -267,8 +267,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 |