Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Allow the containerized compute node to spawn larger VMs"
[apex-tripleo-heat-templates.git]
/
puppet
/
swift-devices-and-proxy-config.yaml
diff --git
a/puppet/swift-devices-and-proxy-config.yaml
b/puppet/swift-devices-and-proxy-config.yaml
index
1cb897e
..
92ef5c1
100644
(file)
--- a/
puppet/swift-devices-and-proxy-config.yaml
+++ b/
puppet/swift-devices-and-proxy-config.yaml
@@
-1,4
+1,4
@@
-heat_template_version: 201
4-10-16
+heat_template_version: 201
5-04-30
description: 'Swift Devices and Proxy Config for Puppet'
parameters:
description: 'Swift Devices and Proxy Config for Puppet'
parameters:
@@
-6,7
+6,6
@@
parameters:
type: comma_delimited_list
object_store_swift_devices:
type: comma_delimited_list
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
controller_swift_proxy_memcaches:
type: comma_delimited_list
@@
-30,6
+29,14
@@
resources:
- list_join:
- ", "
- {get_param: object_store_swift_devices}
- 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:
outputs:
config_id: