diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-02 10:49:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-02 10:49:40 +0000 |
| commit | 04b85b81a659421d2dd13a67dcc151a46751ffc4 (patch) | |
| tree | 20e159b2311b1a08b509203ba1b000e9356584ed | |
| parent | aaf9dc5b55742cc92fbc8e2e525db00fd7f93104 (diff) | |
| parent | 932a9f0409395e1f7e8d83efdd6418d55b040370 (diff) | |
Merge "Create memcache_servers list in swift proxy profile"
| -rw-r--r-- | manifests/profile/base/swift/proxy.pp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp index 1e763a1..a95d05f 100644 --- a/manifests/profile/base/swift/proxy.pp +++ b/manifests/profile/base/swift/proxy.pp @@ -23,14 +23,27 @@ # for more details. # Defaults to hiera('step') # +# [*memcache_servers*] +# (Optional) List of memcache servers +# Defaults to hiera('memcached_node_ips') +# +# [*memcache_port*] +# (Optional) memcache port +# Defaults to 11211 +# class tripleo::profile::base::swift::proxy ( $step = hiera('step'), + $memcache_servers = hiera('memcached_node_ips'), + $memcache_port = 11211, ) { if $step >= 4 { + $swift_memcache_servers = suffix($memcache_servers, ":${memcache_port}") include ::swift::proxy include ::swift::proxy::proxy_logging include ::swift::proxy::healthcheck - include ::swift::proxy::cache + class { '::swift::proxy::cache': + memcache_servers => $swift_memcache_servers + } include ::swift::proxy::keystone include ::swift::proxy::authtoken include ::swift::proxy::staticweb |