From 4e30d0f4051ac5e373a862e7b8ecca05bfd86b60 Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@betacloud-solutions.de>
Date: Mon, 12 Sep 2016 18:32:52 +0200
Subject: [PATCH] Allow a custom keepalived configuration file
TrivialFix
Change-Id: If63053d707e0e6642883745c702d13b63093131a
---
ansible/roles/haproxy/tasks/config.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml
index 50d3246718..1b1fae029e 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: