From 00002f25e14af8fcbbc7f734f26d5ade28a751e7 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 14 Nov 2019 10:39:20 +0000
Subject: [PATCH] Add support for custom Elasticsearch config

Elasticsearch Curator will be driven by custom config. This adds
support in Kayobe for managing it.

Change-Id: Ie739ffbd67c6c26175f152449a7b7276ffa87824
Story: 2006852
Task: 37443
---
 ansible/roles/kolla-openstack/defaults/main.yml             | 6 ++++++
 .../kolla-openstack/molecule/enable-everything/molecule.yml | 1 +
 ansible/roles/kolla-openstack/vars/main.yml                 | 5 +++++
 ...dd-custom-config-for-elasticsearch-a762134e51b50f91.yaml | 3 +++
 4 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/add-custom-config-for-elasticsearch-a762134e51b50f91.yaml

diff --git a/ansible/roles/kolla-openstack/defaults/main.yml b/ansible/roles/kolla-openstack/defaults/main.yml
index f0f028ae0..a58f863d7 100644
--- a/ansible/roles/kolla-openstack/defaults/main.yml
+++ b/ansible/roles/kolla-openstack/defaults/main.yml
@@ -71,6 +71,12 @@ kolla_enable_designate:
 # Free form extra configuration to append to designate.conf.
 kolla_extra_designate:
 
+###############################################################################
+# Elasticsearch configuration.
+
+# Whether to enable elasticsearch.
+kolla_enable_elasticsearch:
+
 ###############################################################################
 # Glance configuration.
 
diff --git a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
index d550d5bc2..176c9e4ca 100644
--- a/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
+++ b/ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
@@ -38,6 +38,7 @@ provisioner:
         kolla_extra_designate: |
           [extra-designate.conf]
           foo=bar
+        kolla_enable_elasticsearch: true
         kolla_enable_glance: true
         kolla_extra_glance: |
           [extra-glance.conf]
diff --git a/ansible/roles/kolla-openstack/vars/main.yml b/ansible/roles/kolla-openstack/vars/main.yml
index a707ef64c..f62be2c16 100644
--- a/ansible/roles/kolla-openstack/vars/main.yml
+++ b/ansible/roles/kolla-openstack/vars/main.yml
@@ -44,6 +44,11 @@ kolla_openstack_custom_config:
     dest: "{{ kolla_node_custom_config_path }}/designate"
     patterns: "*"
     enabled: "{{ kolla_enable_designate }}"
+  # Elasticsearch.
+  - src: "{{ kolla_extra_config_path }}/elasticsearch"
+    dest: "{{ kolla_node_custom_config_path }}/elasticsearch"
+    patterns: "*"
+    enabled: "{{ kolla_enable_elasticsearch }}"
   # Fluentd filters.
   - src: "{{ kolla_extra_config_path }}//fluentd/filter"
     dest: "{{ kolla_node_custom_config_path }}/fluentd/filter"
diff --git a/releasenotes/notes/add-custom-config-for-elasticsearch-a762134e51b50f91.yaml b/releasenotes/notes/add-custom-config-for-elasticsearch-a762134e51b50f91.yaml
new file mode 100644
index 000000000..99a182a1c
--- /dev/null
+++ b/releasenotes/notes/add-custom-config-for-elasticsearch-a762134e51b50f91.yaml
@@ -0,0 +1,3 @@
+features:
+  - |
+    Adds support for custom Elasticsearch configuration.