diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 08:34:04 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-03 08:34:04 -0500 |
| commit | a8edeaea8e8c67f5f930b54ccda5b575340231f5 (patch) | |
| tree | 19de0a44a2a0dedb5e7528b9367441daaceb7e75 | |
| parent | fe320d7e67f88b214d34bfb958cabfe08dd294ca (diff) | |
| parent | 72f35852a044a8d2517d4c6ed72887e155dac524 (diff) | |
| download | openshift-a8edeaea8e8c67f5f930b54ccda5b575340231f5.tar.gz openshift-a8edeaea8e8c67f5f930b54ccda5b575340231f5.tar.bz2 openshift-a8edeaea8e8c67f5f930b54ccda5b575340231f5.tar.xz openshift-a8edeaea8e8c67f5f930b54ccda5b575340231f5.zip | |
Merge pull request #1524 from detiber/haproxy_tuning
Increase maxconn settings for haproxy lb
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 4 | ||||
| -rw-r--r-- | roles/haproxy/templates/haproxy.cfg.j2 | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index acd2f5b11..d087a678a 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -28,7 +28,7 @@ | default([])) | oo_collect('openshift.common.hostname') | default(none, true) }}" - + - set_fact: openshift_master_debug_level: "{{ lookup('oo_option', 'openshift_master_debug_level') | default(openshift.common.debug_level, true) }}" when: openshift_master_debug_level is not defined @@ -232,6 +232,8 @@ hosts: oo_lb_to_config vars: sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" + haproxy_global_maxconn: 20000 + haproxy_default_maxconn: 20000 haproxy_frontend_port: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_port }}" haproxy_frontends: - name: atomic-openshift-api diff --git a/roles/haproxy/templates/haproxy.cfg.j2 b/roles/haproxy/templates/haproxy.cfg.j2 index c932af72f..cb4380971 100644 --- a/roles/haproxy/templates/haproxy.cfg.j2 +++ b/roles/haproxy/templates/haproxy.cfg.j2 @@ -3,7 +3,7 @@ global chroot /var/lib/haproxy pidfile /var/run/haproxy.pid - maxconn 4000 + maxconn {{ haproxy_global_maxconn | default('4000') }} user haproxy group haproxy daemon @@ -20,7 +20,7 @@ defaults log global option httplog option dontlognull - option http-server-close +# option http-server-close option forwardfor except 127.0.0.0/8 option redispatch retries 3 @@ -31,7 +31,7 @@ defaults timeout server 300s timeout http-keep-alive 10s timeout check 10s - maxconn 3000 + maxconn {{ haproxy_default_maxconn | default('3000') }} listen stats :9000 mode http |