From 72c97c315baa8226457155a8e3f41b85507c6b16 Mon Sep 17 00:00:00 2001
From: kaali09 <kaliraja1992@gmail.com>
Date: Thu, 9 Jan 2020 11:05:37 +0530
Subject: [PATCH] DO-2059 added the default elasticsearch env file
---
ansible/roles/log-es6/defaults/main.yml | 2 +-
ansible/roles/log-es6/tasks/elasticsearch-config.yml | 10 ++++++++++
ansible/roles/log-es6/templates/environment.j2 | 2 ++
3 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 ansible/roles/log-es6/templates/environment.j2
diff --git a/ansible/roles/log-es6/defaults/main.yml b/ansible/roles/log-es6/defaults/main.yml
index f0ce74ac3..ffe5d48bf 100644
--- a/ansible/roles/log-es6/defaults/main.yml
+++ b/ansible/roles/log-es6/defaults/main.yml
@@ -1,6 +1,6 @@
---
es_major_version: "6.x"
-es_version: "6.2.3"
+es_version: "6.8.6"
es_version_lock: false
es_use_repository: true
es_templates_fileglob: "files/templates/*.json"
diff --git a/ansible/roles/log-es6/tasks/elasticsearch-config.yml b/ansible/roles/log-es6/tasks/elasticsearch-config.yml
index 4f8ecc672..cd9ee4467 100644
--- a/ansible/roles/log-es6/tasks/elasticsearch-config.yml
+++ b/ansible/roles/log-es6/tasks/elasticsearch-config.yml
@@ -16,6 +16,16 @@
with_items:
- "{{data_dirs}}"
+#Copy the elasticsearch mandatory variable
+- name: Copy the elasticsearch mandatory variables
+ become: yes
+ template:
+ src: environment.j2
+ dest: "{{ env_dir }}"/elasticsearch
+ owner: "{{ e_user }}"
+ group: "{{ es_group }}"
+ mode: 0660
+ force=yes
#Copy the config template
- name: Copy Configuration File
become: yes
diff --git a/ansible/roles/log-es6/templates/environment.j2 b/ansible/roles/log-es6/templates/environment.j2
new file mode 100644
index 000000000..b15e7eba3
--- /dev/null
+++ b/ansible/roles/log-es6/templates/environment.j2
@@ -0,0 +1,2 @@
+JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
+ES_PATH_CONF=/etc/elasticsearch/{{ansible_hostname}}/
--
GitLab