diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-23 22:50:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-23 22:50:10 +0000 |
| commit | e89ceea04deb7ba689fc669d23d6abc3d81c2e76 (patch) | |
| tree | 118fe76ca8051f718b43c20ff0a91cd469274922 /puppet/manifests/overcloud_controller.pp | |
| parent | 5cb0134c8462daf68b42525809fd4c0ce774ec5a (diff) | |
| parent | 99c3db0ea146b55005848fd5230ca0bb63874f58 (diff) | |
Merge "nonha: fix memcached servers string in nova.conf for ipv6"
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 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 |