Don't recalculate EndpointMap to get outputs

As of Ocata, whenever Heat needs to get the value of an output from a
nested Stack it will still load the Stack in memory and re-resolve the
output value. This means that the EndpointMap's endpoint_map output, which
is huge, gets loaded and recalculated whenever showing the EndpointMap or
KeystoneUrl outputs of the main (overcloud) stack. To avoid this, store the
value locally in an OS::Heat::Value resource. This means that the
EndpointMap will only be resolved once, during the stack create/update, and
the outputs can refer to that value.

Change-Id: Ia79eceeea309f5508713a310849f5d366a035430
Depends-On: If0f80cab94c28514d1569b1025362ab9d9d31512
This commit is contained in:
Zane Bitter 2017-02-03 17:52:10 -05:00
parent 17b3de6d56
commit b2ee58c7f6

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
@ -621,7 +627,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]}]}
@ -630,7 +636,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