summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-16 23:59:46 +0000
committerGerrit Code Review <review@openstack.org>2017-01-16 23:59:46 +0000
commitb4af461594ad0e0d32d6644662e6059a1da45d20 (patch)
tree4b05f5902006287407908de503844de82e855da1
parentc68d6c2437715f0e603fceb3cf917c0ccdc26965 (diff)
parentf223d4a4583d2da164592081bb9eb3c19b123f3c (diff)
Merge "Set memcache_servers in /etc/swift/object-expirer.conf"
-rw-r--r--manifests/profile/base/swift/proxy.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 5e0f6c5..5bd75bd 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -81,6 +81,8 @@ class tripleo::profile::base::swift::proxy (
include ::swift::proxy::container_quotas
include ::swift::proxy::account_quotas
- include ::swift::objectexpirer
+ class { '::swift::objectexpirer':
+ memcache_servers => $swift_memcache_servers
+ }
}
}