summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-14 10:30:25 +0000
committerGerrit Code Review <review@openstack.org>2017-07-14 10:30:25 +0000
commitf5e031bf9a87b086841f95db587c2110fe5115ca (patch)
treeb201bcd217f69baaa23d67b2bea83eb4ffb386f5
parentc031108b9ac358042f726c1745be4151eca4a812 (diff)
parentb108289aa610b7d378d4461d942698eda35b4f31 (diff)
Merge "Remove special-case of memcache node ips for ipv6"
-rw-r--r--overcloud.j2.yaml2
-rw-r--r--puppet/all-nodes-config.yaml7
2 files changed, 0 insertions, 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}