aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/swift-devices-and-proxy-config.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2016-09-01 15:52:25 +0100
committerEmilien Macchi <emilien@redhat.com>2016-09-03 19:47:16 +0000
commitb8f154be31c5847dc376a72cf9c0835aa0001afd (patch)
treed9ce286e5ec2afe6c9f1d739fcabd29fc1738c38 /puppet/swift-devices-and-proxy-config.yaml
parent8a02eeba4b06445b0c1da8ba5d4f4e5e175c5172 (diff)
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
Diffstat (limited to 'puppet/swift-devices-and-proxy-config.yaml')
-rw-r--r--puppet/swift-devices-and-proxy-config.yaml10
1 files changed, 0 insertions, 10 deletions
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: