aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-04 05:18:43 +0000
committerGerrit Code Review <review@openstack.org>2016-10-04 05:18:43 +0000
commit81b9392886224b8516a297e5bd957560cf14cb5d (patch)
tree3e03bb3edc1ca0aea2ac585b36c60647d360532a /overcloud.j2.yaml
parent575bf581ea359aded71683f5db6bef5ebebaeaa6 (diff)
parentc947008d9e2d36f4a68f18ff1f56fa5b9bf21873 (diff)
Merge "Make keystone api network hiera composable"
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r--overcloud.j2.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index bd699f50..fc756617 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -340,8 +340,6 @@ resources:
{% endfor %}
# FIXME(shardy): These require further work to move into service_ips
memcache_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, MemcachedNetwork]}]}
- keystone_public_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]}
- keystone_admin_api_node_ips: {get_attr: [ControllerIpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]}
NetVipMap: {get_attr: [VipMap, net_ip_map]}
RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]}