diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-23 23:04:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-23 23:04:00 +0000 |
| commit | 32254a60e0c6de37092181c7a52ca132ab89196c (patch) | |
| tree | 70496416c76ef327cd188903420424c75863b14e /puppet/manifests/overcloud_controller.pp | |
| parent | e89ceea04deb7ba689fc669d23d6abc3d81c2e76 (diff) | |
| parent | aadb34dc02ada859cc96a46dc2525d1d0e7b8934 (diff) | |
Merge "configure horizon with memcached ipv6 when needed"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
| -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 78545099..a4d4784b 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -633,8 +633,15 @@ if hiera('step') >= 3 { } $neutron_options = {'profile_support' => $_profile_support } + $memcached_ipv6 = hiera('memcached_ipv6', false) + if $memcached_ipv6 { + $horizon_memcached_servers = hiera('memcache_node_ips_v6', '[::1]') + } else { + $horizon_memcached_servers = hiera('memcache_node_ips', '127.0.0.1') + } + class { '::horizon': - cache_server_ip => hiera('memcache_node_ips', '127.0.0.1'), + cache_server_ip => $horizon_memcached_servers, neutron_options => $neutron_options, } |