openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove special-case of memcache node ips for ipv6

Browse Source 
This should be handled in puppet-tripleo, as is done for some other
services e.g ceph.  This has also been identified as a possible
performance problem due to the nested get_attr calls.

Change-Id: I7e14f0219c28c023c4e8e1d4693f0bfa9674d801
Related-Bug: #1684272
Depends-On: Iccb9089db4b382db3adb9340f18f6d2364ca7f58
This commit is contained in:
Steven Hardy 2017-07-06 14:37:31 +01:00 committed by Dan Sneddon
parent fb5eb77331
commit b108289aa6
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
overcloud.j2.yaml
View File

@ -581,8 +581,6 @@ resources:
{% for role in roles %} {% for role in roles %}
- {get_attr: [{{role.name}}IpListMap, short_service_bootstrap_hostnames]} - {get_attr: [{{role.name}}IpListMap, short_service_bootstrap_hostnames]}
{% endfor %} {% endfor %}
# FIXME(shardy): These require further work to move into service_ips
memcache_node_ips: {get_attr: [{{primary_role_name}}IpListMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, MemcachedNetwork]}]}
NetVipMap: {get_attr: [VipMap, net_ip_map]} NetVipMap: {get_attr: [VipMap, net_ip_map]}
RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]} RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]}

7
puppet/all-nodes-config.yaml
View File

@ -30,8 +30,6 @@ parameters:
type: json type: json
controller_names: controller_names:
type: comma_delimited_list type: comma_delimited_list
memcache_node_ips:
type: comma_delimited_list
NetVipMap: NetVipMap:
type: json type: json
RedisVirtualIP: RedisVirtualIP:
@ -170,11 +168,6 @@ resources:
list_join: list_join:
- ',' - ','
- {get_param: controller_names} - {get_param: controller_names}
memcached_node_ips_v6:
repeat:
template: "inet6:[NAME]"
for_each:
NAME: {get_param: memcache_node_ips}
deploy_identifier: {get_param: DeployIdentifier} deploy_identifier: {get_param: DeployIdentifier}
update_identifier: {get_param: UpdateIdentifier} update_identifier: {get_param: UpdateIdentifier}
stack_action: {get_param: StackAction} stack_action: {get_param: StackAction}