diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 15:40:18 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 15:40:18 -0500 |
| commit | 484547222a9f4dfef8b97c965ce637c56a9fc2e6 (patch) | |
| tree | 2707f38fcfc2171974ac6c336321dce6c7b58932 | |
| parent | b0ebc4302507ca9464837281ea9cf4aeb5ef4e90 (diff) | |
| parent | 01fefc8ad19d7ab7dcfc4e0380979477ab04cfc6 (diff) | |
| download | openshift-484547222a9f4dfef8b97c965ce637c56a9fc2e6.tar.gz openshift-484547222a9f4dfef8b97c965ce637c56a9fc2e6.tar.bz2 openshift-484547222a9f4dfef8b97c965ce637c56a9fc2e6.tar.xz openshift-484547222a9f4dfef8b97c965ce637c56a9fc2e6.zip | |
Merge pull request #1540 from detiber/haproxy_tuning
Add setting for configuring nofile limit for haproxy
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | roles/haproxy/tasks/main.yml | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index d087a678a..3c7d94c96 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -232,6 +232,7 @@ hosts: oo_lb_to_config vars: sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" + haproxy_limit_nofile: 100000 haproxy_global_maxconn: 20000 haproxy_default_maxconn: 20000 haproxy_frontend_port: "{{ hostvars[groups.oo_first_master.0].openshift.master.api_port }}" diff --git a/roles/haproxy/tasks/main.yml b/roles/haproxy/tasks/main.yml index 0b8370ce2..837fa67db 100644 --- a/roles/haproxy/tasks/main.yml +++ b/roles/haproxy/tasks/main.yml @@ -3,6 +3,26 @@ action: "{{ ansible_pkg_mgr }} name=haproxy state=present" when: not openshift.common.is_containerized | bool +- name: Configure systemd service directory for haproxy + file: + path: /etc/systemd/system/haproxy.service.d + state: directory + when: haproxy_limit_nofile is defined + +- name: Configure the nofile limits for haproxy + ini_file: + dest: /etc/systemd/system/haproxy.service.d/limits.conf + section: Service + option: LimitNOFILE + value: "{{ haproxy_limit_nofile }}" + when: haproxy_limit_nofile is defined + notify: restart haproxy + register: nofile_limit_result + +- name: Reload systemd if needed + command: systemctl daemon-reload + when: nofile_limit_result | changed + - name: Configure haproxy template: src: haproxy.cfg.j2 |