From 24c596468baa7a9f306bbe42880348a25e10c788 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Sun, 28 Aug 2016 12:39:16 +0100 Subject: Remove hard-coded per-service rabbitmq hieradata To avoid the hard-coded references which won't work with composable roles, we instead default to the rabbitmq_node_ips list in the per-service puppet-tripleo profiles. Change-Id: I76b7e06781fdd5d969503b6d73423bb3f5f7a41f Depends-On: Ie53c93456529420588eb1927703ea91b54095d87 Partially-Implements: blueprint custom-roles --- overcloud.yaml | 1 - 1 file changed, 1 deletion(-) (limited to 'overcloud.yaml') diff --git a/overcloud.yaml b/overcloud.yaml index bcba079e..d286e7dd 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -630,7 +630,6 @@ resources: 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]}]} -- cgit 1.2.3-korg