Merge "Fixup the memcached servers string in nova.conf for v6"

diff --cc puppet/all-nodes-config.yaml
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
index 5e5ecdc,4959528..4ee2fc9
--- 1/puppet/manifests/overcloud_controller_pacemaker.pp
--- 2/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@@ -625,11 -577,21 +625,18 @@@ if hiera('step') >= 3 
      manage_service => false,
      enabled        => false,
    }
 +  include ::glance::notify::rabbitmq
    include join(['::glance::backend::', $glance_backend])
 -  $rabbit_port = hiera('rabbitmq::port')
 -  class { '::glance::notify::rabbitmq':
 -    rabbit_hosts => suffix(hiera('rabbit_node_ips'), ":${rabbit_port}"),
 -  }
  
+   $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