summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChandler Wilkerson <cwilkers@redhat.com>2017-11-06 12:41:22 -0500
committerChandler Wilkerson <cwilkers@redhat.com>2017-11-06 16:24:54 -0500
commit966e031276e4bcda17f96ebd93d94789a4befd73 (patch)
treed72fb43842b69ec6d0538aae6fe4b53865239bf6
parent5efcf4a2f7e9c2f21c6f9f86dc08f12fd5f56290 (diff)
downloadopenshift-966e031276e4bcda17f96ebd93d94789a4befd73.tar.gz
openshift-966e031276e4bcda17f96ebd93d94789a4befd73.tar.bz2
openshift-966e031276e4bcda17f96ebd93d94789a4befd73.tar.xz
openshift-966e031276e4bcda17f96ebd93d94789a4befd73.zip
Mod startup script to publish all frontend binds
-rw-r--r--roles/openshift_loadbalancer/templates/haproxy.docker.service.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 b/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2
index 72182fcdd..29a0a6759 100644
--- a/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2
+++ b/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2
@@ -5,7 +5,7 @@ PartOf={{ openshift.docker.service_name }}.service
[Service]
ExecStartPre=-/usr/bin/docker rm -f openshift_loadbalancer
-ExecStart=/usr/bin/docker run --rm --name openshift_loadbalancer -p {{ openshift_master_api_port | default(8443) }}:{{ openshift_master_api_port | default(8443) }} -v /etc/haproxy/haproxy.cfg:/etc/haproxy/haproxy.cfg:ro --entrypoint=haproxy {{ openshift.common.router_image }}:{{ openshift_image_tag }} -f /etc/haproxy/haproxy.cfg
+ExecStart=/usr/bin/docker run --rm --name openshift_loadbalancer {% for frontend in openshift_loadbalancer_frontends %} {% for bind in frontend.binds %} -p {{ bind |regex_replace('^[^:]*:(\d+).*$', '\\1') }}:{{ bind |regex_replace('^[^:]*:(\d+).*$', '\\1') }} {% endfor %} {% endfor %} -v /etc/haproxy/haproxy.cfg:/etc/haproxy/haproxy.cfg:ro --entrypoint=haproxy {{ openshift.common.router_image }}:{{ openshift_image_tag }} -f /etc/haproxy/haproxy.cfg
ExecStartPost=/usr/bin/sleep 10
ExecStop=/usr/bin/docker stop openshift_loadbalancer
LimitNOFILE={{ openshift_loadbalancer_limit_nofile | default(100000) }}