From 31d617fdc0e86ece3c6e8f6afc160df414c20d87 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Tue, 28 Aug 2018 22:13:37 +0000 Subject: [PATCH] update haproxy too Signed-off-by: Rick Elrod --- roles/haproxy/templates/haproxy.cfg | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index f58e3e9f6c..ac866d03d0 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -366,20 +366,15 @@ backend osbs-backend balance hdr(appserver) server osbs-master01 osbs-master01:8443 check inter 10s rise 1 fall 2 check ssl verify none -frontend docker-registry-frontend +frontend oci-registry-frontend bind 0.0.0.0:10048 - default_backend docker-registry-backend + default_backend oci-registry-backend -backend docker-registry-backend +backend oci-registry-backend balance hdr(appserver) -{% if env == "staging" %} - server docker-registry01 docker-registry01:5000 check inter 10s rise 1 fall 2 - server docker-registry02 docker-registry02:5000 check inter 10s rise 1 fall 2 -{% endif %} -{% if env == "production" %} server oci-registry01 oci-registry01:5000 check inter 10s rise 1 fall 2 server oci-registry02 oci-registry02:5000 check inter 10s rise 1 fall 2 -{% endif %} + {% if env == "staging" %} frontend retrace-frontend @@ -445,18 +440,13 @@ backend krb5-backend # server ipa02 ipa02:88 weight 1 maxconn 16384 {% endif %} -frontend docker-candidate-registry-frontend +frontend oci-candidate-registry-frontend bind 0.0.0.0:10054 - default_backend docker-candidate-registry-backend + default_backend oci-candidate-registry-backend -backend docker-candidate-registry-backend +backend oci-candidate-registry-backend balance hdr(appserver) -{% if env == "staging" %} - server docker-candidate-registry01 docker-candidate-registry01:5000 check inter 10s rise 1 fall 2 -{% endif %} -{% if env == "production" %} server oci-candidate-registry01 oci-candidate-registry01:5000 check inter 10s rise 1 fall 2 -{% endif %} frontend modernpaste-frontend bind 0.0.0.0:10055