From: Christian Schwede <cschwede@redhat.com>
Date: Wed, 30 Nov 2016 07:32:12 +0000 (+0000)
Subject: Set memcache_servers in /etc/swift/object-expirer.conf
X-Git-Tag: opnfv-6.0.0~411^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f223d4a4583d2da164592081bb9eb3c19b123f3c;p=apex-puppet-tripleo.git

Set memcache_servers in /etc/swift/object-expirer.conf

This defaults to 127.0.0.1:11211 without setting these explicitly. The
object-expirer is working without a correct memcache server, however it
is slower and warnings will be logged.

Related-Bug: 1627927
Depends-On: Ie139f018c4a742b014dd4d682970e154d66a8c6d
Change-Id: I89a879592a264d541cf42f007584e2e78058c867
---

diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index da69279..78a1996 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -74,6 +74,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
+    }
   }
 }