summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-12 15:57:12 +0000
committerGerrit Code Review <review@openstack.org>2016-08-12 15:57:12 +0000
commit2c877c9c4b08983ac2d45e1c2c2a8da60f608ad5 (patch)
treee1f659fefc5dd1cfaa95d39bc927565ec084d7b1
parent46e7d8110fc3a09d8e6b8c30e1dd1f45519f2c8f (diff)
parente8683a863d8389d7f89f8841a9695aed7d65ee87 (diff)
Merge "Align node_ips hiera keys with the service name."
-rw-r--r--puppet/all-nodes-config.yaml34
1 files changed, 33 insertions, 1 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 793b17dd..6f13b74e 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -104,7 +104,7 @@ resources:
list_join:
- ','
- {get_param: controller_names}
- rabbit_node_ips: &rabbit_nodes_array
+ rabbit_node_ips:
str_replace:
template: "['SERVERS_LIST']"
params:
@@ -112,6 +112,22 @@ resources:
list_join:
- "','"
- {get_param: rabbit_node_ips}
+ rabbitmq_node_ips: &rabbit_nodes_array
+ str_replace:
+ template: "['SERVERS_LIST']"
+ params:
+ SERVERS_LIST:
+ list_join:
+ - "','"
+ - {get_param: rabbit_node_ips}
+ mongodb_node_ips:
+ str_replace:
+ template: "['SERVERS_LIST']"
+ params:
+ SERVERS_LIST:
+ list_join:
+ - "','"
+ - {get_param: mongo_node_ips}
mongo_node_ips:
str_replace:
template: "['SERVERS_LIST']"
@@ -128,6 +144,22 @@ resources:
list_join:
- "','"
- {get_param: redis_node_ips}
+ memcached_node_ips:
+ str_replace:
+ template: "['SERVERS_LIST']"
+ params:
+ SERVERS_LIST:
+ list_join:
+ - "','"
+ - {get_param: memcache_node_ips}
+ memcached_node_ips_v6:
+ str_replace:
+ template: "['inet6:[SERVERS_LIST]']"
+ params:
+ SERVERS_LIST:
+ list_join:
+ - "]','inet6:["
+ - {get_param: memcache_node_ips}
memcache_node_ips:
str_replace:
template: "['SERVERS_LIST']"