From b8f154be31c5847dc376a72cf9c0835aa0001afd Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Thu, 1 Sep 2016 15:52:25 +0100
Subject: Remove mangling swift memcached list (now in puppet-tripleo)

Moved this list manipulation to puppet-tripleo where it can easily
reference the memcached_node_ips array instead of hard-coded output
from the Controller.

Depends-On: Ic8872e5e51732874ca5b93bff5efd3e7ed75bc31
Change-Id: I523a802c8d22be7602728ebe8966d9e2ee109cde
Partially-Implements: blueprint custom-roles
---
 overcloud.yaml                             |  1 -
 puppet/controller.yaml                     | 14 --------------
 puppet/swift-devices-and-proxy-config.yaml | 10 ----------
 3 files changed, 25 deletions(-)

diff --git a/overcloud.yaml b/overcloud.yaml
index 68ee23cb..84ac2f44 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -855,7 +855,6 @@ resources:
     properties:
       controller_swift_devices: {get_attr: [Controller, swift_device]}
       object_store_swift_devices: {get_attr: [ObjectStorage, swift_device]}
-      controller_swift_proxy_memcaches: {get_attr: [Controller, swift_proxy_memcache]}
 
   ControllerAllNodesDeployment:
     type: OS::Heat::StructuredDeployments
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 7650c1e8..4fec2958 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -492,20 +492,6 @@ outputs:
                   template: "NETWORK_uri"
                   params:
                     NETWORK: {get_param: [ServiceNetMap, SwiftMgmtNetwork]}
-  swift_proxy_memcache:
-    description: Swift proxy-memcache value
-    value:
-      str_replace:
-        template: "IP:11211"
-        params:
-          IP:
-            get_attr:
-              - NetIpMap
-              - net_ip_map
-              - str_replace:
-                  template: "NETWORK_uri"
-                  params:
-                    NETWORK: {get_param: [ServiceNetMap, MemcachedNetwork]}
   tls_key_modulus_md5:
     description: MD5 checksum of the TLS Key Modulus
     value: {get_attr: [NodeTLSData, key_modulus_md5]}
diff --git a/puppet/swift-devices-and-proxy-config.yaml b/puppet/swift-devices-and-proxy-config.yaml
index 14df831f..afee4dac 100644
--- a/puppet/swift-devices-and-proxy-config.yaml
+++ b/puppet/swift-devices-and-proxy-config.yaml
@@ -6,8 +6,6 @@ parameters:
     type: comma_delimited_list
   object_store_swift_devices:
     type: comma_delimited_list
-  controller_swift_proxy_memcaches:
-    type: comma_delimited_list
 
 resources:
 
@@ -29,14 +27,6 @@ resources:
                     - list_join:
                       - ", "
                       - {get_param: object_store_swift_devices}
-                swift::proxy::cache::memcache_servers:
-                  str_replace:
-                    template: "['SERVERS_LIST']"
-                    params:
-                      SERVERS_LIST:
-                        list_join:
-                        - "','"
-                        - {get_param: controller_swift_proxy_memcaches}
 
 outputs:
   config_id:
-- 
cgit 1.2.3-korg