CLE-Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Rework haproxy template so we do not have a block of whitespace changes with staging conditionals

Browse source
This commit is contained in:
Kevin Fenzi 2016-08-08 17:08:42 +00:00
parent 6b86434251
commit 221479b040
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
roles/haproxy/templates/haproxy.cfg
View file

@ -295,27 +295,30 @@ listen osbs 0.0.0.0:10047
listen docker-registry 0.0.0.0:10048 listen docker-registry 0.0.0.0:10048
balance hdr(appserver) balance hdr(appserver)
server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2 server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2
{% if env == "staging" %} {% if env == "staging" %}
listen retrace 0.0.0.0:10049 listen retrace 0.0.0.0:10049
balance hdr(appserver) balance hdr(appserver)
server retrace01 retrace01:80 check inter 10s rise 1 fall 2 server retrace01 retrace01:80 check inter 10s rise 1 fall 2
{% endif %}
{% endif %}
{% if env == "staging" %} {% if env == "staging" %}
listen faf 0.0.0.0:10050 listen faf 0.0.0.0:10050
balance hdr(appserver) balance hdr(appserver)
server faf01 faf01:80 check inter 10s rise 1 fall 2 server faf01 faf01:80 check inter 10s rise 1 fall 2
{% endif %}
{% endif %}
{% if env == "staging" %} {% if env == "staging" %}
listen pps 0.0.0.0:10051 listen pps 0.0.0.0:10051
balance hdr(appserver) balance hdr(appserver)
server mdapi01 mdapi01:80 check inter 10s rise 1 fall 2 server mdapi01 mdapi01:80 check inter 10s rise 1 fall 2
option httpchk GET /pps option httpchk GET /pps
{% endif %}
{% endif %}
{% if env == "staging" %} {% if env == "staging" %}
listen fas3 0.0.0.0:10052 listen fas3 0.0.0.0:10052
# These values are set extremely low so any issues are recovered from very # These values are set extremely low so any issues are recovered from very
# quickly. Setting these higher will cause odd behavior in apps that # 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) balance hdr(appserver)
server fas3-01.stg fas3-01.stg:80 check inter 5s rise 1 fall 2 server fas3-01.stg fas3-01.stg:80 check inter 5s rise 1 fall 2
option httpchk GET /fas3/ option httpchk GET /fas3/
{% endif %}
{% endif %}
{% if env == "staging" %} {% if env == "staging" %}
listen ipa 0.0.0.0:10053 listen ipa 0.0.0.0:10053
balance hdr(appserver) balance hdr(appserver)
server ipa01 ipa01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem server ipa01 ipa01:443 check inter 10s rise 1 fall 2 ssl verify required ca-file /etc/haproxy/ipa.pem
option httpchk GET / option httpchk GET /
{% endif %} {% endif %}
# Apache doesn't handle the initial connection here like the other proxy # Apache doesn't handle the initial connection here like the other proxy