summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-12 19:38:02 +0000
committerGerrit Code Review <review@openstack.org>2017-07-12 19:38:02 +0000
commitf236656a5a666d084274f11cb334c3a81cf21491 (patch)
tree6b3a7c8332a72cd7ff66bcb3194bf823c101ca00
parentc4b52f3daa8474832790041cf885385a3addb2d6 (diff)
parentb5c110f1c18dd006bae15c48d4936ec8ad307e32 (diff)
Merge "Add dependency relationship between nested get_attr targets"
-rw-r--r--overcloud.j2.yaml9
1 files changed, 9 insertions, 0 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 56a10a52..f238e3b4 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -680,6 +680,10 @@ resources:
StorageMgmtIp: {get_attr: [StorageMgmtVirtualIP, ip_address]}
StorageMgmtIpUri: {get_attr: [StorageMgmtVirtualIP, ip_address_uri]}
# No tenant or management VIP required
+ # Because of nested get_attr functions in the KeystoneAdminVip output, we
+ # can't determine which attributes of VipMap are used until after
+ # ServiceNetMap's attribute values are available.
+ depends_on: ServiceNetMap
# All Nodes Validations
AllNodesValidationConfig:
@@ -787,6 +791,11 @@ outputs:
value: {get_attr: [EndpointMapData, value, KeystonePublic, uri]}
KeystoneAdminVip:
description: Keystone Admin VIP endpoint
+ # Note that these nested get_attr functions require a dependency
+ # relationship between VipMap and ServiceNetMap, since we can't determine
+ # which attributes of VipMap are used until after ServiceNetMap's attribute
+ # values are available. If this is ever reworked to not use nested
+ # get_attr, that dependency can be removed.
value: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]}
EndpointMap:
description: |