diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-04-09 20:18:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-04-09 20:18:38 +0000 |
| commit | ea327280931da20c258cc30a64bd9c57cc0b8ddb (patch) | |
| tree | ebf436a6a27df7f271312fa7b9e90ce673a8dfc0 | |
| parent | b529653d313c7fe23d870df6ea81e267c23373fe (diff) | |
| parent | 33d8680b9c2444238c1e8c912dd9a63cd30c9d45 (diff) | |
Merge "Wire in list of controller nodes as memcache_servers for Swift proxy"
| -rw-r--r-- | puppet/swift-devices-and-proxy-config.yaml | 9 |
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: |