aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/all-nodes-config.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-03 16:03:51 +0000
committerGerrit Code Review <review@openstack.org>2016-09-03 16:03:51 +0000
commit51258bc6bb87c5f434b286d3f843587c821a69de (patch)
tree7a658481fe03f897fbc7d8c22fdd0cafb9f1cae3 /puppet/all-nodes-config.yaml
parent2c567e06ea75167c13d396a31a1996a0f60c45a2 (diff)
parentbf3bc0d551f180f931e6cb3234307a540affd0de (diff)
Merge "Generate composable service node_names lists"
Diffstat (limited to 'puppet/all-nodes-config.yaml')
-rw-r--r--puppet/all-nodes-config.yaml13
1 files changed, 3 insertions, 10 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index a43e9645..17b72d4b 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -12,6 +12,8 @@ parameters:
type: comma_delimited_list
service_ips:
type: json
+ service_node_names:
+ type: json
controller_names:
type: comma_delimited_list
rabbit_node_ips:
@@ -22,8 +24,6 @@ parameters:
type: comma_delimited_list
keystone_admin_api_node_ips:
type: comma_delimited_list
- ceph_mon_node_names:
- type: comma_delimited_list
DeployIdentifier:
type: string
description: >
@@ -76,6 +76,7 @@ resources:
str_split: [',', {get_param: enabled_services}]
# provides a mapping of service_name_ips to a list of IPs
- {get_param: service_ips}
+ - {get_param: service_node_names}
- controller_node_ips:
list_join:
- ','
@@ -84,10 +85,6 @@ resources:
list_join:
- ','
- {get_param: controller_names}
- galera_node_names:
- list_join:
- - ','
- - {get_param: controller_names}
rabbitmq_node_ips: &rabbit_nodes_array
str_replace:
template: "['SERVERS_LIST']"
@@ -120,10 +117,6 @@ resources:
list_join:
- "','"
- {get_param: keystone_admin_api_node_ips}
- tripleo::profile::base::ceph::ceph_mon_initial_members:
- list_join:
- - ','
- - {get_param: ceph_mon_node_names}
# NOTE(gfidente): interpolation with %{} in the
# hieradata file can't be used as it returns string
ceilometer::rabbit_hosts: *rabbit_nodes_array