From: Jason Guiditta <jguiditt@redhat.com>
Date: Thu, 25 Feb 2016 15:27:26 +0000 (-0500)
Subject: loadbalancer: fix Redis timeout HAproxy config
X-Git-Tag: opnfv-6.0.0~801^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6e4870915281c80176ea08584f337099e60e2b2d;p=apex-puppet-tripleo.git

loadbalancer: fix Redis timeout HAproxy config

Current HAproxy config is broken for Redis timeout parameters. This is what we
have today by default in HAproxy logs:
[WARNING] 238/115010 (13878) : config : missing timeouts for proxy 'redis'.
| While not properly invalid, you will certainly encounter various problems
| with such a configuration. To fix this, please ensure that all following
| timeouts are set to a non-zero value: 'client', 'connect', 'server'.

This patch removes the explicit setting of client and server timeouts to 0,
which is the cause of the above warning.  Instead, Redis will simply inherit the
haproxy defaults, which should be a more reasonable setting, and result in no
warnings.

Change-Id: Ibe7941bec02f5facf21732910c9ad96f547ff8e5
---

diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 387f022..21d44e0 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -1233,7 +1233,6 @@ class tripleo::loadbalancer (
     haproxy::listen { 'redis':
       bind             => $redis_bind_opts,
       options          => {
-        'timeout'   => [ 'client 0', 'server 0' ],
         'balance'   => 'first',
         'option'    => ['tcp-check',],
         'tcp-check' => ['send info\ replication\r\n','expect string role:master'],