Merge "Set memcached_servers for nova API"
authorJenkins <jenkins@review.openstack.org>
Tue, 18 Oct 2016 23:27:40 +0000 (23:27 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 18 Oct 2016 23:27:40 +0000 (23:27 +0000)
1  2 
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