aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorChristian Berendt <berendt@betacloud-solutions.de>2016-09-12 18:32:52 +0200
committerChristian Berendt <berendt@betacloud-solutions.de>2016-09-20 16:43:47 +0200
commit4e30d0f4051ac5e373a862e7b8ecca05bfd86b60 (patch)
treeb31b0d4dfc1668c021fce5f0004ed682686e135a /ansible
parent6417595b9f822c44a86bf1ac905f9ac19344000d (diff)
downloadkolla-4e30d0f4051ac5e373a862e7b8ecca05bfd86b60.tar.gz
kolla-4e30d0f4051ac5e373a862e7b8ecca05bfd86b60.zip
Allow a custom keepalived configuration file
TrivialFix Change-Id: If63053d707e0e6642883745c702d13b63093131a
Diffstat (limited to 'ansible')
-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..1b1fae029 100644
--- a/ansible/roles/haproxy/tasks/config.yml
+++ b/ansible/roles/haproxy/tasks/config.yml
@@ -32,10 +32,12 @@
- name: Copying over keepalived.conf
template:
- src: "{{ item }}.conf.j2"
- dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf"
- with_items:
- - "keepalived"
+ src: "{{ item }}"
+ dest: "{{ node_config_directory }}/keepalived/keepalived.conf"
+ with_first_found:
+ - "{{ node_custom_config }}/keepalived/{{ inventory_hostname }}/keepalived.conf"
+ - "{{ node_custom_config }}/keepalived/keepalived.conf"
+ - "keepalived.conf.j2"
- name: Copying over haproxy.pem
copy: