From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 18 Oct 2016 23:27:40 +0000 (+0000)
Subject: Merge "Set memcached_servers for nova API"
X-Git-Tag: opnfv-6.0.0~527
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=15c70b7a376e2b3a3055921e3509fb19fd740bfe;p=apex-puppet-tripleo.git

Merge "Set memcached_servers for nova API"
---

15c70b7a376e2b3a3055921e3509fb19fd740bfe
diff --cc manifests/profile/base/nova/api.pp
index 6aedd3e,e45f4b0..ca2f7dd
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@@ -39,9 -39,20 +39,19 @@@ class tripleo::profile::base::nova::ap
  
    if $step >= 4 or ($step >= 3 and $sync_db) {
  
+     if hiera('nova::use_ipv6', false) {
+       $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips_v6'))), ':11211')
+     } else {
+       $memcache_servers = suffix(any2array(normalize_ip_for_uri(hiera('memcached_node_ips'))), ':11211')
+     }
+ 
+     class { '::nova::keystone::authtoken':
+       memcached_servers => $memcache_servers
+     }
+ 
      class { '::nova::api':
 -      service_name => 'httpd', # Temporary: will be moved to t-h-t
 -      sync_db      => $sync_db,
 -      sync_db_api  => $sync_db,
 +      sync_db     => $sync_db,
 +      sync_db_api => $sync_db,
      }
      include ::nova::wsgi::apache
      include ::nova::network::neutron