openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Don't recalculate EndpointMap to get outputs"

Browse Source
This commit is contained in:
Jenkins 2017-02-27 09:19:16 +00:00 committed by Gerrit Code Review
commit 8bd9652ca2
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
overcloud.j2.yaml
View File

@ -243,6 +243,12 @@ resources:
NetIpMap: {get_attr: [VipMap, net_ip_map]} NetIpMap: {get_attr: [VipMap, net_ip_map]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMapData:
type: OS::Heat::Value
properties:
type: json
value: {get_attr: [EndpointMap, endpoint_map]}
# Jinja loop for Role in roles_data.yaml # Jinja loop for Role in roles_data.yaml
{% for role in roles %} {% for role in roles %}
# Resources generated for {{role.name}} Role # Resources generated for {{role.name}} Role
@ -634,7 +640,7 @@ outputs:
value: true value: true
KeystoneURL: KeystoneURL:
description: URL for the Overcloud Keystone service description: URL for the Overcloud Keystone service
value: {get_attr: [EndpointMap, endpoint_map, KeystonePublic, uri]} value: {get_attr: [EndpointMapData, value, KeystonePublic, uri]}
KeystoneAdminVip: KeystoneAdminVip:
description: Keystone Admin VIP endpoint description: Keystone Admin VIP endpoint
value: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]} value: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]}
@ -643,7 +649,7 @@ outputs:
Mapping of the resources with the needed info for their endpoints. Mapping of the resources with the needed info for their endpoints.
This includes the protocol used, the IP, port and also a full This includes the protocol used, the IP, port and also a full
representation of the URI. representation of the URI.
value: {get_attr: [EndpointMap, endpoint_map]} value: {get_attr: [EndpointMapData, value]}
HostsEntry: HostsEntry:
description: | description: |
The content that should be appended to your /etc/hosts if you want to get The content that should be appended to your /etc/hosts if you want to get