summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-04-07 11:22:24 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-04-07 11:22:24 -0400
commit33d8680b9c2444238c1e8c912dd9a63cd30c9d45 (patch)
tree2a57f33f71ac44f2db383a748f2585515bb22a93
parent0c14b2ad3e0114ffa0aa9514cdfe3dd9d9d212a8 (diff)
Wire in list of controller nodes as memcache_servers for Swift proxy
Change-Id: Id193f8c13e3ad3e05bd884be5ba65621b9369d0e
-rw-r--r--puppet/swift-devices-and-proxy-config.yaml9
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/swift-devices-and-proxy-config.yaml b/puppet/swift-devices-and-proxy-config.yaml
index 1cb897ee..731f69a1 100644
--- a/puppet/swift-devices-and-proxy-config.yaml
+++ b/puppet/swift-devices-and-proxy-config.yaml
@@ -6,7 +6,6 @@ parameters:
type: comma_delimited_list
object_store_swift_devices:
type: comma_delimited_list
- # TODO: add support for puppet swift proxy memcache configuration
controller_swift_proxy_memcaches:
type: comma_delimited_list
@@ -30,6 +29,14 @@ 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: