diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-22 07:48:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-22 07:48:16 +0000 |
| commit | 62c3643f4a4e4c4e40179bfe52f4dc6c5b9adedc (patch) | |
| tree | 056555cd5ffedf82bf1de45d432be7f811974de1 | |
| parent | 76ff764522e04a873be7443e579b7881e9ed32a2 (diff) | |
| parent | 19ed74d63816fffa8e581ccc50f6a528819e8a45 (diff) | |
| download | kolla-62c3643f4a4e4c4e40179bfe52f4dc6c5b9adedc.tar.gz kolla-62c3643f4a4e4c4e40179bfe52f4dc6c5b9adedc.zip | |
Merge "Allow a custom haproxy configuration file"
| -rw-r--r-- | ansible/roles/haproxy/tasks/config.yml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml index 1b1fae029..b23f19f3f 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -25,10 +25,12 @@ - name: Copying over haproxy.cfg template: - src: "{{ item }}.cfg.j2" - dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.cfg" - with_items: - - "haproxy" + src: "{{ item }}" + dest: "{{ node_config_directory }}/haproxy/haproxy.cfg" + with_first_found: + - "{{ node_custom_config }}/haproxy/{{ inventory_hostname }}/haproxy.cfg" + - "{{ node_custom_config }}/haproxy/haproxy.cfg" + - "haproxy.cfg.j2" - name: Copying over keepalived.conf template: |