From b108289aa610b7d378d4461d942698eda35b4f31 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 6 Jul 2017 14:37:31 +0100 Subject: Remove special-case of memcache node ips for ipv6 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 --- overcloud.j2.yaml | 2 -- puppet/all-nodes-config.yaml | 7 ------- 2 files changed, 9 deletions(-) diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index ea5b2928..0fc410d6 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -581,8 +581,6 @@ resources: {% for role in roles %} - {get_attr: [{{role.name}}IpListMap, short_service_bootstrap_hostnames]} {% 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]} RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]} ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]} diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index b1284452..b29a8a98 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -30,8 +30,6 @@ parameters: type: json controller_names: type: comma_delimited_list - memcache_node_ips: - type: comma_delimited_list NetVipMap: type: json RedisVirtualIP: @@ -170,11 +168,6 @@ resources: list_join: - ',' - {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} update_identifier: {get_param: UpdateIdentifier} stack_action: {get_param: StackAction} -- cgit 1.2.3-korg