diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-08-12 17:44:24 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2016-09-02 13:00:49 +0000 |
| commit | bf3bc0d551f180f931e6cb3234307a540affd0de (patch) | |
| tree | 0f94354f9379435255819da241f046006a22b105 /puppet | |
| parent | dada8f55bff69fd1d37c34555a2ba58f3c854962 (diff) | |
Generate composable service node_names lists
Some puppet interfaces require a comma separated list of hostnames
where a service is running, so generate it in a similar way to th
service ips.
Change-Id: Icdf5d993d089dc94035194bdbd52299fcbc793be
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 13 |
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 |