From f19cb7f22582a602dec0e469196442e906de0c52 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 25 Jul 2020 09:56:35 -0700 Subject: [PATCH] haproxy: adjust staging haproxy for things that should exist Signed-off-by: Kevin Fenzi --- roles/haproxy/templates/haproxy.cfg | 56 +++++++++-------------------- 1 file changed, 17 insertions(+), 39 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index cb380524a2..6f2f0e4cc2 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -85,17 +85,17 @@ backend freemedia-backend {% endif %} option httpchk GET /freemedia/FreeMedia-form.html -frontend packages-frontend - bind 0.0.0.0:10016 - default_backend packages-backend - -backend packages-backend - balance hdr(appserver) - server packages03 packages03:80 check inter 5s rise 2 fall 3 -{% if env == "production" %} - server packages04 packages04:80 check inter 5s rise 2 fall 3 -{% endif %} - option httpchk GET /packages/_heartbeat +#frontend packages-frontend +# bind 0.0.0.0:10016 +# default_backend packages-backend +# +#backend packages-backend +# balance hdr(appserver) +# server packages03 packages03:80 check inter 5s rise 2 fall 3 +#{% if env == "production" %} +# server packages04 packages04:80 check inter 5s rise 2 fall 3 +#{% endif %} +# option httpchk GET /packages/_heartbeat frontend totpcgiprovision-frontend bind 0.0.0.0:10019 @@ -179,7 +179,9 @@ frontend notifs-web-frontend backend notifs-web-backend balance hdr(appserver) server notifs-web01 notifs-web01:80 check inter 10s rise 1 fall 2 +{% if env == "production" %} server notifs-web02 notifs-web02:80 check inter 10s rise 1 fall 2 +{% endif %} option httpchk GET /notifications/_heartbeat frontend github2fedmsg-frontend @@ -200,18 +202,16 @@ backend kerneltest-backend server kerneltest01 kerneltest01:80 check inter 10s rise 1 fall 2 option httpchk GET /kerneltest +{% if env == "production" %} frontend openqa-frontend bind 0.0.0.0:10044 default_backend openqa-backend backend openqa-backend balance hdr(appserver) -{% if env == "production" %} server openqa01 openqa01:80 check inter 10s rise 1 fall 2 -{% else %} - server openqa-stg01.qa.fedoraproject.org openqa-stg01.qa.fedoraproject.org:80 check inter 10s rise 1 fall 2 -{% endif %} option httpchk GET /api/v1/job_groups/1 +{% endif %} frontend pdc-frontend bind 0.0.0.0:10045 @@ -256,17 +256,6 @@ backend oci-registry-backend {% if env == "staging" %} -frontend faf-frontend - bind 0.0.0.0:10050 - default_backend faf-backend - -backend faf-backend - balance hdr(appserver) - server faf01 faf01:80 check inter 10s rise 1 fall 2 - -{% endif %} -{% if env == "staging" %} - frontend pps-frontend bind 0.0.0.0:10051 default_backend pps-backend @@ -385,7 +374,9 @@ frontend mbs-frontend backend mbs-backend balance hdr(appserver) server mbs-frontend01 mbs-frontend01:80 check inter 20s rise 2 fall 3 +{% if env == "staging" %} server mbs-frontend02 mbs-frontend02:80 check inter 20s rise 2 fall 3 +{% endif %} option httpchk GET /module-build-service/1/component-builds/ frontend odcs-frontend @@ -397,19 +388,6 @@ backend odcs-backend server odcs-frontend01 odcs-frontend01:80 check inter 20s rise 2 fall 3 option httpchk GET /api/1/composes/ -{% if env == "staging" %} -frontend copr-frontend - bind 0.0.0.0:10070 - default_backend copr-backend - -backend copr-backend - balance hdr(appserver) - cookie SERVERID insert indirect nocache - server copr-frontend01 copr-frontend01:80 check inter 10s rise 1 fall 2 cookie copr-frontend01 - server copr-frontend02 copr-frontend02:80 check inter 10s rise 1 fall 2 cookie copr-frontend02 - option httpchk GET /api_3/ -{% endif %} - {% if datacenter == "iad2" %} # These ports are for proxying rabbitmq (AMQP) protocol through. # At this moment, internal- and public-rabbitmq both point to the exact same set of