From 5e6d8e074f2fdd4f95da18d5ca8bbd2fe328b61e Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 5 Oct 2017 13:33:08 +0000 Subject: [PATCH] Fix PDC haproxy entry, to the original intent. --- roles/haproxy/templates/haproxy.cfg | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/roles/haproxy/templates/haproxy.cfg b/roles/haproxy/templates/haproxy.cfg index b9cb807ad2..1e3df553a6 100644 --- a/roles/haproxy/templates/haproxy.cfg +++ b/roles/haproxy/templates/haproxy.cfg @@ -271,14 +271,17 @@ listen openqa 0.0.0.0:10044 listen pdc 0.0.0.0:10045 balance hdr(appserver) + +{% if env != "staging" %} # Set session persistence with a cookie. # https://jdennis.fedorapeople.org/doc/rhsso-tripleo-federation/html/rhsso-tripleo-federation.html#step-18-use-proxy-persistence-for-keystone-on-each-controller cookie SERVERID insert indirect nocache - -{% if env == "staging" %} - server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2 cookie pdc-web01 {% endif %} + + server pdc-web01 pdc-web01:80 check inter 10s rise 1 fall 2 cookie pdc-web01 +{% if env != "staging" %} server pdc-web02 pdc-web02:80 check inter 10s rise 1 fall 2 cookie pdc-web02 +{% endif %} option httpchk GET /rest_api/v1/ timeout server 3600000