aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-26 16:56:32 +0000
committerGerrit Code Review <review@openstack.org>2017-05-26 16:56:32 +0000
commit7996b2e817b8f53f6e3dc579023e20ef61751c31 (patch)
tree4cc1bf9a24fac2cec3eafc004e376870ec91f8a9
parent34cbc97d57ea618ec97267e24f030e02f7b124d0 (diff)
parent3c9733f395e1ef10c5d6f48bd5f696d668bd6f05 (diff)
Merge "Add RoleNetHostnameMap output"
-rw-r--r--overcloud.j2.yaml14
1 files changed, 13 insertions, 1 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 361a685..cd9369f 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
@@ -741,3 +747,9 @@ outputs:
{% 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 %}