diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-12-18 15:21:21 -0500 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-12-18 18:16:16 -0500 |
| commit | 313b15fb2668cbe6738802f913a9caa6203083b2 (patch) | |
| tree | 533fe287d8b9f05b80f84ebd1dafb37da8025d72 /roles/openshift_loadbalancer | |
| parent | ee8592c34d48f9b65b38aab6cfb8f57a4b5edcbd (diff) | |
| download | openshift-313b15fb2668cbe6738802f913a9caa6203083b2.tar.gz openshift-313b15fb2668cbe6738802f913a9caa6203083b2.tar.bz2 openshift-313b15fb2668cbe6738802f913a9caa6203083b2.tar.xz openshift-313b15fb2668cbe6738802f913a9caa6203083b2.zip | |
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')
| -rw-r--r-- | roles/openshift_loadbalancer/defaults/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_loadbalancer/templates/haproxy.docker.service.j2 | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/roles/openshift_loadbalancer/defaults/main.yml b/roles/openshift_loadbalancer/defaults/main.yml index f9c16ba40..6ffe3f11e 100644 --- a/roles/openshift_loadbalancer/defaults/main.yml +++ b/roles/openshift_loadbalancer/defaults/main.yml @@ -2,6 +2,12 @@ r_openshift_loadbalancer_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" r_openshift_loadbalancer_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" +openshift_router_image_default_dict: + origin: 'openshift/origin-haproxy-router' + openshift-enterprise: 'openshift3/ose-haproxy-router' +openshift_router_image_default: "{{ openshift_router_image_default_dict[openshift_deployment_type] }}" +openshift_router_image: "{{ openshift_router_image_default }}" + haproxy_frontends: - name: main binds: diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml index 7d23ea6c8..3ca6c8cbe 100644 --- a/roles/openshift_loadbalancer/tasks/main.yml +++ b/roles/openshift_loadbalancer/tasks/main.yml @@ -10,7 +10,7 @@ - name: Pull haproxy image command: > - docker pull {{ openshift.common.router_image }}:{{ openshift_image_tag }} + docker pull {{ openshift_router_image }}:{{ openshift_image_tag }} when: openshift.common.is_containerized | bool - name: Create config directory for haproxy 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) }} |