From 221479b04007006e2bf363c5ac73e0ecf1b5c3c0 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 8 Aug 2016 17:08:42 +0000 Subject: [PATCH] Rework haproxy template so we do not have a block of whitespace changes with staging conditionals --- roles/haproxy/templates/haproxy.cfg | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index c4ac1c55bf..f17d8431a4 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -295,27 +295,30 @@ listen osbs 0.0.0.0:10047 listen docker-registry 0.0.0.0:10048 balance hdr(appserver) server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2 - {% if env == "staging" %} + listen retrace 0.0.0.0:10049 balance hdr(appserver) server retrace01 retrace01:80 check inter 10s rise 1 fall 2 -{% endif %} +{% endif %} {% if env == "staging" %} + listen faf 0.0.0.0:10050 balance hdr(appserver) server faf01 faf01:80 check inter 10s rise 1 fall 2 -{% endif %} +{% endif %} {% if env == "staging" %} + listen pps 0.0.0.0:10051 balance hdr(appserver) server mdapi01 mdapi01:80 check inter 10s rise 1 fall 2 option httpchk GET /pps -{% endif %} +{% endif %} {% if env == "staging" %} + listen fas3 0.0.0.0:10052 # These values are set extremely low so any issues are recovered from very # quickly. Setting these higher will cause odd behavior in apps that @@ -323,13 +326,15 @@ listen fas3 0.0.0.0:10052 balance hdr(appserver) server fas3-01.stg fas3-01.stg:80 check inter 5s rise 1 fall 2 option httpchk GET /fas3/ -{% endif %} +{% endif %} {% if env == "staging" %} + listen ipa 0.0.0.0:10053 balance hdr(appserver) server ipa01 ipa01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem option httpchk GET / + {% endif %} # Apache doesn't handle the initial connection here like the other proxy