diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-25 08:16:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 08:16:53 -0500 |
| commit | 1fc50fe66e982af1cad58db2f6bddf05cbbef985 (patch) | |
| tree | 03199015a9ad8f0d12d47eedb9da72107c5bf29c | |
| parent | b09163ff0e87e457ca9f8cdc9cb42c6c8e241fbb (diff) | |
| parent | 7d5d91f3fc9542abfde5c855a0e7e82fde0e640a (diff) | |
| download | openshift-1fc50fe66e982af1cad58db2f6bddf05cbbef985.tar.gz openshift-1fc50fe66e982af1cad58db2f6bddf05cbbef985.tar.bz2 openshift-1fc50fe66e982af1cad58db2f6bddf05cbbef985.tar.xz openshift-1fc50fe66e982af1cad58db2f6bddf05cbbef985.zip | |
Merge pull request #3147 from andrewklau/haproxy-container
Fix containerized haproxy config
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/templates/haproxy.cfg.j2 | 8 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml index e9bc8b4ab..68bb4ace8 100644 --- a/roles/openshift_loadbalancer/tasks/main.yml +++ b/roles/openshift_loadbalancer/tasks/main.yml @@ -17,7 +17,7 @@ - name: Create the systemd unit files template: src: "haproxy.docker.service.j2" - dest: "{{ containerized_svc_dir }}/haproxy.service" + dest: "/etc/systemd/system/haproxy.service" when: openshift.common.is_containerized | bool notify: restart haproxy diff --git a/roles/openshift_loadbalancer/templates/haproxy.cfg.j2 b/roles/openshift_loadbalancer/templates/haproxy.cfg.j2 index 79e695001..24fd635ec 100644 --- a/roles/openshift_loadbalancer/templates/haproxy.cfg.j2 +++ b/roles/openshift_loadbalancer/templates/haproxy.cfg.j2 @@ -1,16 +1,20 @@ # Global settings #--------------------------------------------------------------------- global + maxconn {{ openshift_loadbalancer_global_maxconn | default(20000) }} + log /dev/log local0 info +{% if openshift.common.is_containerized | bool %} + stats socket /var/lib/haproxy/run/haproxy.sock mode 600 level admin +{% else %} chroot /var/lib/haproxy pidfile /var/run/haproxy.pid - maxconn {{ openshift_loadbalancer_global_maxconn | default(20000) }} user haproxy group haproxy daemon - log /dev/log local0 info # turn on stats unix socket stats socket /var/lib/haproxy/stats +{% endif %} #--------------------------------------------------------------------- # common defaults that all the 'listen' and 'backend' sections will diff --git a/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 b/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 index 624876ab0..5385df3b7 100644 --- a/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 +++ b/roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 @@ -5,7 +5,7 @@ PartOf=docker.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 -f /etc/haproxy/haproxy.cfg" {{ openshift.common.router_image }}:{{ openshift_image_tag }} +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 ExecStartPost=/usr/bin/sleep 10 ExecStop=/usr/bin/docker stop openshift_loadbalancer LimitNOFILE={{ openshift_loadbalancer_limit_nofile | default(100000) }} |