From bf3bc0d551f180f931e6cb3234307a540affd0de Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Fri, 12 Aug 2016 17:44:24 +0100
Subject: 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
---
 overcloud.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'overcloud.yaml')

diff --git a/overcloud.yaml b/overcloud.yaml
index a85c57c0..7b473829 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -598,6 +598,7 @@ resources:
       ManagementIpList: {get_attr: [Controller, management_ip_address]}
       EnabledServices: {get_attr: [ControllerServiceChain, role_data, service_names]}
       ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]}
+      ServiceHostnameList: {get_attr: [Controller, hostname]}
 
   allNodesConfig:
     type: OS::TripleO::AllNodes::SoftwareConfig
@@ -629,12 +630,12 @@ resources:
       controller_ips: {get_attr: [Controller, ip_address]}
       controller_names: {get_attr: [Controller, hostname]}
       service_ips: {get_attr: [ControllerIpListMap, service_ips]}
+      service_node_names: {get_attr: [ControllerIpListMap, service_hostnames]}
       # FIXME(shardy): These require further work to move into service_ips
       rabbit_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, RabbitmqNetwork]}]}
       memcache_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, MemcachedNetwork]}]}
       keystone_public_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]}
       keystone_admin_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]}
-      ceph_mon_node_names: {get_attr: [Controller, hostname]}
       DeployIdentifier: {get_param: DeployIdentifier}
       UpdateIdentifier: {get_param: UpdateIdentifier}
 
-- 
cgit 1.2.3-korg