aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2016-09-12 18:36:33 +0200
committerChristian Berendt <berendt@betacloud-solutions.de>2016-09-20 16:41:52 +0200
commit19ed74d63816fffa8e581ccc50f6a528819e8a45 (patch)
tree31b83a51076721502297459d4f3496df73a6fe51
parent6417595b9f822c44a86bf1ac905f9ac19344000d (diff)
downloadkolla-19ed74d63816fffa8e581ccc50f6a528819e8a45.tar.gz
kolla-19ed74d63816fffa8e581ccc50f6a528819e8a45.zip
Allow a custom haproxy configuration file
TrivialFix Change-Id: I5ebb8bc42fa9483adfb397ba1856c750a3b70a7b
-rw-r--r--ansible/roles/haproxy/tasks/config.yml10
1 files changed, 6 insertions, 4 deletions
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml
index 50d324671..1ec4245d3 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: