diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-22 15:20:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-22 15:20:08 -0500 |
| commit | c24aec308f515dd7a1ae09d35cd95617530615b9 (patch) | |
| tree | cd24905d23b9e4116d52709a258539998e81af81 /roles/openshift_loadbalancer/tasks | |
| parent | 5f92d54e6ea903e9c17c005f5f04caf7443ab06f (diff) | |
| parent | c537e9599fc01dfeddb84cbcc52fa6991cb3ab27 (diff) | |
| download | openshift-c24aec308f515dd7a1ae09d35cd95617530615b9.tar.gz openshift-c24aec308f515dd7a1ae09d35cd95617530615b9.tar.bz2 openshift-c24aec308f515dd7a1ae09d35cd95617530615b9.tar.xz openshift-c24aec308f515dd7a1ae09d35cd95617530615b9.zip | |
Merge pull request #3106 from andrewklau/haproxy-container
Add containzerized haproxy option
Diffstat (limited to 'roles/openshift_loadbalancer/tasks')
| -rw-r--r-- | roles/openshift_loadbalancer/tasks/main.yml | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/roles/openshift_loadbalancer/tasks/main.yml b/roles/openshift_loadbalancer/tasks/main.yml index 400f80715..e9bc8b4ab 100644 --- a/roles/openshift_loadbalancer/tasks/main.yml +++ b/roles/openshift_loadbalancer/tasks/main.yml @@ -1,14 +1,31 @@ --- -- fail: msg="Cannot use containerized=true for load balancer hosts." - when: openshift.common.is_containerized | bool - - name: Install haproxy package: name=haproxy state=present + when: not openshift.common.is_containerized | bool + +- name: Pull haproxy image + command: > + docker pull {{ openshift.common.router_image }}:{{ openshift_image_tag }} + when: openshift.common.is_containerized | bool + +- name: Create config directory for haproxy + file: + path: /etc/haproxy + state: directory + when: openshift.common.is_containerized | bool + +- name: Create the systemd unit files + template: + src: "haproxy.docker.service.j2" + dest: "{{ containerized_svc_dir }}/haproxy.service" + when: openshift.common.is_containerized | bool + notify: restart haproxy - name: Configure systemd service directory for haproxy file: path: /etc/systemd/system/haproxy.service.d state: directory + when: not openshift.common.is_containerized | bool # Work around ini_file create option in 2.2 which defaults to no - name: Create limits.conf file @@ -19,6 +36,7 @@ owner: root group: root changed_when: false + when: not openshift.common.is_containerized | bool - name: Configure the nofile limits for haproxy ini_file: @@ -27,6 +45,7 @@ option: LimitNOFILE value: "{{ openshift_loadbalancer_limit_nofile | default(100000) }}" notify: restart haproxy + when: not openshift.common.is_containerized | bool - name: Configure haproxy template: |