aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-18 23:27:40 +0000
committerGerrit Code Review <review@openstack.org>2016-10-18 23:27:40 +0000
commit15c70b7a376e2b3a3055921e3509fb19fd740bfe (patch)
treeade105fe1e068e82e587fade04782b8f6afcc419
parentc1df1d5b8289274da058ddac7575af0d65cb5fb7 (diff)
parent2e234e2e3510e405de2ff97754b96681bf49bcff (diff)
Merge "Set memcached_servers for nova API"
-rw-r--r--manifests/profile/base/nova/api.pp10
1 files changed, 10 insertions, 0 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp
index 6aedd3e..ca2f7dd 100644
--- a/manifests/profile/base/nova/api.pp
+++ b/manifests/profile/base/nova/api.pp
@@ -39,6 +39,16 @@ class tripleo::profile::base::nova::api (
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':
sync_db => $sync_db,
sync_db_api => $sync_db,