From 3c9733f395e1ef10c5d6f48bd5f696d668bd6f05 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 17 May 2017 14:34:06 +0100 Subject: Add RoleNetHostnameMap output This exposes a list of hostnames similar to the RoleNetIpMap, this will be consumed by the dynamic inventory ref https://review.openstack.org/465558 Change-Id: I61efac5634e9b6fbb820e693c71a0adae5fa8b6a --- overcloud.j2.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 56651696..846b1b9b 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -373,7 +373,13 @@ resources: EnabledServices: {get_attr: [{{role.name}}ServiceNames, value]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} ServiceHostnameList: {get_attr: [{{role.name}}, hostname]} - NetworkHostnameMap: + NetworkHostnameMap: {get_attr: [{{role.name}}NetworkHostnameMap, value]} + + {{role.name}}NetworkHostnameMap: + type: OS::Heat::Value + properties: + type: json + value: # Note (shardy) this somewhat complex yaql may be replaced # with a map_deep_merge function in ocata. It merges the # list of maps, but appends to colliding lists so we can @@ -740,4 +746,10 @@ outputs: value: {% for role in roles %} {{role.name}}: {get_attr: [{{role.name}}IpListMap, net_ip_map]} +{% endfor %} + RoleNetHostnameMap: + description: Mapping of each network to a list of hostnames for each role + value: +{% for role in roles %} + {{role.name}}: {get_attr: [{{role.name}}NetworkHostnameMap, value]} {% endfor %} -- cgit 1.2.3-korg