diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-27 09:19:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-27 09:19:16 +0000 |
| commit | 8bd9652ca23019c95c4c8360592e9acf4b89fe86 (patch) | |
| tree | fae6032a8c2eb12ef5145555200365d758947cb6 | |
| parent | 3ebe390a3887909b87a4d367746a9c8dbfbe1d09 (diff) | |
| parent | b2ee58c7f6883011b4ba8b387eedc63d3600aea0 (diff) | |
Merge "Don't recalculate EndpointMap to get outputs"
| -rw-r--r-- | overcloud.j2.yaml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index e9447b94..e99f770f 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -243,6 +243,12 @@ resources: NetIpMap: {get_attr: [VipMap, net_ip_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 {% for role in roles %} # Resources generated for {{role.name}} Role @@ -634,7 +640,7 @@ outputs: value: true KeystoneURL: description: URL for the Overcloud Keystone service - value: {get_attr: [EndpointMap, endpoint_map, KeystonePublic, uri]} + value: {get_attr: [EndpointMapData, value, KeystonePublic, uri]} KeystoneAdminVip: description: Keystone Admin VIP endpoint 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. This includes the protocol used, the IP, port and also a full representation of the URI. - value: {get_attr: [EndpointMap, endpoint_map]} + value: {get_attr: [EndpointMapData, value]} HostsEntry: description: | The content that should be appended to your /etc/hosts if you want to get |