diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-01-06 12:37:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-01-06 12:37:20 +0000 |
| commit | 8a0c4b82bba33361853091bcbdef9f4eb4d940bf (patch) | |
| tree | d49bd9d78b20c478b739a308aeb104207d2f99f7 | |
| parent | 4a5f1bc6bc5fe28c2f2f64a3485bac2a697de0ac (diff) | |
| parent | 00ca7b29602b2e49fe537777db06f9f1a03028f2 (diff) | |
Merge "loadbalancer: fix MySQL timeout HAproxy config"
| -rw-r--r-- | manifests/loadbalancer.pp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/manifests/loadbalancer.pp b/manifests/loadbalancer.pp index 887c9d2..0c00eb2 100644 --- a/manifests/loadbalancer.pp +++ b/manifests/loadbalancer.pp @@ -1066,15 +1066,17 @@ class tripleo::loadbalancer ( if $mysql_clustercheck { $mysql_listen_options = { - 'option' => [ 'tcpka', 'httpchk' ], - 'timeout' => [ 'client 0', 'server 0' ], - 'stick-table' => 'type ip size 1000', - 'stick' => 'on dst', + 'option' => [ 'tcpka', 'httpchk' ], + 'timeout client' => '90m', + 'timeout server' => '90m', + 'stick-table' => 'type ip size 1000', + 'stick' => 'on dst', } $mysql_member_options = ['check', 'inter 2000', 'rise 2', 'fall 5', 'backup', 'port 9200', 'on-marked-down shutdown-sessions'] } else { $mysql_listen_options = { - 'timeout' => [ 'client 0', 'server 0' ], + 'timeout client' => '90m', + 'timeout server' => '90m', } $mysql_member_options = ['check', 'inter 2000', 'rise 2', 'fall 5', 'backup'] } |