Skip to content

CIPAAS-435 Update haproxy template to Openshift 3.11

Alberto Rodriguez Peon requested to merge openshift_3.11 into master

CC/ @alossent

Using the 3.11 template (from: https://github.com/openshift/origin/blob/release-3.11/images/router/haproxy/conf/haproxy-config.template) with our customization embedded in the right places. The changeset looks bigger than it is due to some indentantion changes upstream.

I took the opportunity to drop https://gitlab.cern.ch/paas-tools/custom-haproxy-router/blob/master/conf/haproxy-config.template#L435-437 as this was included upstream.

Edited by Alexandre Lossent

Merge request reports