diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-12-19 07:39:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 07:39:22 -0800 |
| commit | 7ab8e67bfc62e16466e3fd211fded63f16583403 (patch) | |
| tree | 5d4d5ea3182a4ad089267010d0fc267fde5043b4 /roles/openshift_loadbalancer/templates | |
| parent | f119b7c15b10e9d20b5fb9d234c7cd2e54b402e6 (diff) | |
| parent | 313b15fb2668cbe6738802f913a9caa6203083b2 (diff) | |
| download | openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.gz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.bz2 openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.tar.xz openshift-7ab8e67bfc62e16466e3fd211fded63f16583403.zip | |
Merge pull request #6515 from mgugino-upstream-stage/defacting
Automatic merge from submit-queue.
Remove some small items from openshift_facts
Remove some small items from openshift_facts that
don't need to be there.
Diffstat (limited to 'roles/openshift_loadbalancer/templates')
| -rw-r--r-- | roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 | 2 |
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 0343a7eb0..90111449c 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 {% 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 +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_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) }} |