Merge "Allow a custom haproxy configuration file"

2016-09-22 07:48:16 +00:00 · 2016-09-22 07:48:16 +00:00 · 62c3643f4a
commit 62c3643f4a
parent 76ff764522 19ed74d638
1 changed files with 6 additions and 4 deletions
--- 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: