Merge pull request #18053 from sdodson/pr17990

Automatic merge from submit-queue.

Bump router to haprox18

Author: openshift-merge-robot

images/router/haproxy/Dockerfile

@@ -5,8 +5,10 @@
 #
 FROM openshift/origin
 
-RUN INSTALL_PKGS="haproxy" && \
-    yum install -y $INSTALL_PKGS && \
+RUN INSTALL_PKGS="haproxy18" && \
+    yum install yum-utils && \
+    yum-config-manager --add http://cbs.centos.org/repos/paas7-openshift-origin38-testing/x86_64/os/ && \
+    yum install --nogpgcheck -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     yum clean all && \
     mkdir -p /var/lib/haproxy/router/{certs,cacerts} && \