From 44430a42421a7c59807a58cbbd67f90a154fd30a Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Tue, 12 Mar 2019 17:57:21 +0000
Subject: [PATCH] Support custom keepalived config

Allow users to use the custom config mechanism for Keepalived
provided by Kolla Ansible.

Change-Id: I052bd8283944197cd2b13747e7a7c32fbe06c045
Story: 2005211
Task: 29989
---
 ansible/roles/kolla-openstack/vars/main.yml                  | 5 +++++
 doc/source/configuration/kolla-ansible.rst                   | 1 +
 ..._support_for_custom_keepalived_conf-b26a242761c1f5b3.yaml | 3 +++
 3 files changed, 9 insertions(+)
 create mode 100644 releasenotes/notes/add_support_for_custom_keepalived_conf-b26a242761c1f5b3.yaml

diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index 457230c41..ff8d3fdcd 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -100,6 +100,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/keystone"
     patterns: "*"
     enabled: true
+  # Keepalived.
+  - src: "{{ kolla_extra_config_path }}/keepalived"
+    dest: "{{ kolla_node_custom_config_path }}/keepalived"
+    patterns: "*"
+    enabled: "{{ kolla_enable_haproxy }}"
   # Magnum.
   - src: "{{ kolla_extra_config_path }}/magnum"
     dest: "{{ kolla_node_custom_config_path }}/magnum"
diff --git a/doc/source/configuration/kolla-ansible.rst b/doc/source/configuration/kolla-ansible.rst
index b80b8e253..ab514e305 100644
--- a/doc/source/configuration/kolla-ansible.rst
+++ b/doc/source/configuration/kolla-ansible.rst
@@ -162,6 +162,7 @@ which files are supported.
    ``ironic.conf``                 Ironic configuration.
    ``ironic/*``                    Extended ironic configuration.
    ``keystone/*``                  Extended keystone configuration.
+   ``keepalived/*``                Extended keepalived configuration.
    ``magnum.conf``                 Magnum configuration.
    ``magnum/*``                    Extended magnum configuration.
    ``manila.conf``                 Manila configuration.
diff --git a/releasenotes/notes/add_support_for_custom_keepalived_conf-b26a242761c1f5b3.yaml b/releasenotes/notes/add_support_for_custom_keepalived_conf-b26a242761c1f5b3.yaml
new file mode 100644
index 000000000..8abce020c
--- /dev/null
+++ b/releasenotes/notes/add_support_for_custom_keepalived_conf-b26a242761c1f5b3.yaml
@@ -0,0 +1,3 @@
+---
+features:
+  - Adds support for custom Keepalived configuration.