summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-17 15:28:18 +0000
committerGerrit Code Review <review@openstack.org>2016-08-17 15:28:18 +0000
commitbacc2c6f6cb0b80bd39c4164e8487e583b6976ba (patch)
treeabea4691a4567f78877be4a8a812024c6fbe137f /puppet
parentee5a98bbe45025b1fab76d338d38eb74c8c0bc43 (diff)
parent65619843d29653fb952794a5c45076c8531266d4 (diff)
Merge "Remove deprecated node_ips hiera keys"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml32
1 files changed, 0 insertions, 32 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 6f13b74e..f1ce42b1 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -104,14 +104,6 @@ resources:
list_join:
- ','
- {get_param: controller_names}
- rabbit_node_ips:
- str_replace:
- template: "['SERVERS_LIST']"
- params:
- SERVERS_LIST:
- list_join:
- - "','"
- - {get_param: rabbit_node_ips}
rabbitmq_node_ips: &rabbit_nodes_array
str_replace:
template: "['SERVERS_LIST']"
@@ -128,14 +120,6 @@ resources:
list_join:
- "','"
- {get_param: mongo_node_ips}
- mongo_node_ips:
- str_replace:
- template: "['SERVERS_LIST']"
- params:
- SERVERS_LIST:
- list_join:
- - "','"
- - {get_param: mongo_node_ips}
redis_node_ips:
str_replace:
template: "['SERVERS_LIST']"
@@ -160,22 +144,6 @@ resources:
list_join:
- "]','inet6:["
- {get_param: memcache_node_ips}
- memcache_node_ips:
- str_replace:
- template: "['SERVERS_LIST']"
- params:
- SERVERS_LIST:
- list_join:
- - "','"
- - {get_param: memcache_node_ips}
- memcache_node_ips_v6:
- str_replace:
- template: "['inet6:[SERVERS_LIST]']"
- params:
- SERVERS_LIST:
- list_join:
- - "]','inet6:["
- - {get_param: memcache_node_ips}
mysql_node_ips:
str_replace:
template: "['SERVERS_LIST']"