summaryrefslogtreecommitdiffstats
path: root/roles/haproxy
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-08-25 14:40:08 -0400
committerAndrew Butcher <abutcher@redhat.com>2015-11-04 19:57:22 -0500
commitac0f4cb56e1469e9033e3a218265bc70f774624d (patch)
treeef752e894c17dfae7f3bd1b1cf87e2209925b4ca /roles/haproxy
parent18c877db73dcb63b1402322fe8352505006e4985 (diff)
downloadopenshift-ac0f4cb56e1469e9033e3a218265bc70f774624d.tar.gz
openshift-ac0f4cb56e1469e9033e3a218265bc70f774624d.tar.bz2
openshift-ac0f4cb56e1469e9033e3a218265bc70f774624d.tar.xz
openshift-ac0f4cb56e1469e9033e3a218265bc70f774624d.zip
more tweaks
Diffstat (limited to 'roles/haproxy')
-rw-r--r--roles/haproxy/defaults/main.yml7
-rw-r--r--roles/haproxy/meta/main.yml4
-rw-r--r--roles/haproxy/templates/haproxy.cfg.j29
3 files changed, 17 insertions, 3 deletions
diff --git a/roles/haproxy/defaults/main.yml b/roles/haproxy/defaults/main.yml
index 16e9af4d1..7ba5bd485 100644
--- a/roles/haproxy/defaults/main.yml
+++ b/roles/haproxy/defaults/main.yml
@@ -12,3 +12,10 @@ haproxy_backends:
- name: web01
address: 127.0.0.1:9000
opts: check
+
+os_firewall_use_firewalld: False
+os_firewall_allow:
+- service: haproxy stats
+ port: "9000/tcp"
+- service: haproxy balance
+ port: "8443/tcp"
diff --git a/roles/haproxy/meta/main.yml b/roles/haproxy/meta/main.yml
index e02d8f53c..0fad106a9 100644
--- a/roles/haproxy/meta/main.yml
+++ b/roles/haproxy/meta/main.yml
@@ -9,4 +9,6 @@ galaxy_info:
- name: EL
versions:
- 7
-dependencies: []
+dependencies:
+- { role: os_firewall }
+- { role: openshift_repos }
diff --git a/roles/haproxy/templates/haproxy.cfg.j2 b/roles/haproxy/templates/haproxy.cfg.j2
index fddf0ede1..c932af72f 100644
--- a/roles/haproxy/templates/haproxy.cfg.j2
+++ b/roles/haproxy/templates/haproxy.cfg.j2
@@ -27,12 +27,17 @@ defaults
timeout http-request 10s
timeout queue 1m
timeout connect 10s
- timeout client 1m
- timeout server 1m
+ timeout client 300s
+ timeout server 300s
timeout http-keep-alive 10s
timeout check 10s
maxconn 3000
+listen stats :9000
+ mode http
+ stats enable
+ stats uri /
+
{% for frontend in haproxy_frontends %}
frontend {{ frontend.name }}
{% for bind in frontend.binds %}