summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-03-03 17:44:04 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-03-07 11:31:41 -0500
commit01fefc8ad19d7ab7dcfc4e0380979477ab04cfc6 (patch)
tree228d8502e54dbb3add5c6fa929660ecb5f374f81
parentfaacbce80c0946be1451b1f2593c1f55dd64c133 (diff)
downloadopenshift-01fefc8ad19d7ab7dcfc4e0380979477ab04cfc6.tar.gz
openshift-01fefc8ad19d7ab7dcfc4e0380979477ab04cfc6.tar.bz2
openshift-01fefc8ad19d7ab7dcfc4e0380979477ab04cfc6.tar.xz
openshift-01fefc8ad19d7ab7dcfc4e0380979477ab04cfc6.zip
Add setting for configuring nofile limit for haproxy
-rw-r--r--playbooks/common/openshift-master/config.yml1
-rw-r--r--roles/haproxy/tasks/main.yml20
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