summaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-03 14:55:49 +0000
committerGerrit Code Review <review@openstack.org>2016-03-03 14:55:49 +0000
commitad875e3361ee6c8492b00f7d1d36bd9b59d1f981 (patch)
tree32e3fd01681c3dd6126957ed52f05c392c42cc46 /manifests
parent3aefa43072d9453412376a9bdedd949e03c926a5 (diff)
parent6e4870915281c80176ea08584f337099e60e2b2d (diff)
Merge "loadbalancer: fix Redis timeout HAproxy config"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/loadbalancer.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp
index 4e5c37f..efba87a 100644
--- a/manifests/loadbalancer.pp
+++ b/manifests/loadbalancer.pp
@@ -1235,7 +1235,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'],