diff options
author | Eric Wolinetz <ewolinet@redhat.com> | 2017-01-23 16:08:20 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-23 16:08:20 -0600 |
commit | 066494438d5baff9f555cd56a8bde94df148dc31 (patch) | |
tree | e0c802a5af8dc07f0a16b5d41ebea55de4a34d06 /roles/openshift_loadbalancer/tasks | |
parent | d740fd159416783c88839e6e2c2e150eb81b67da (diff) | |
parent | c2bdcebcf9bc8aebba6d09a80c6b5cccdb17786d (diff) | |
download | openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.gz openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.bz2 openshift-066494438d5baff9f555cd56a8bde94df148dc31.tar.xz openshift-066494438d5baff9f555cd56a8bde94df148dc31.zip |
Merge branch 'master' into fix_logging_jks_gen
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: |