diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-02-27 21:02:48 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-02-27 21:02:48 +0000 |
commit | fb672cbb5524f71bc5e65d56ac3dfdee10d896cb (patch) | |
tree | 40a5e9c03c9e62c3541debe285aae0d5e0f93a5b /overcloud.j2.yaml | |
parent | 856ff05d5d54d1dead8626ce3200d849f3a038f2 (diff) | |
parent | 94e27e64d469d6a25c9e7b5dca2f06a5479268a7 (diff) |
Merge "Don't recalculate EndpointMap to get outputs" into stable/ocata
Diffstat (limited to 'overcloud.j2.yaml')
-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 5b2ca4a2..bbb5bae4 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 @@ -622,7 +628,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]}]} @@ -631,7 +637,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 |