From df428f5f52632bb3cf0d7163f2c05346cefae95d Mon Sep 17 00:00:00 2001
From: Rshad Zhran <rashzk95@gmail.com>
Date: Mon, 15 Jul 2019 14:04:13 +0200
Subject: [PATCH] fixed elasticsearch installation for Centos 6.* - Adding Java
 Installation

---
 molecule/elasticsearch/molecule.yml           |  2 +-
 molecule/elasticsearch/tests/test_default.py  |  2 +-
 .../ansible-elasticsearch/tasks/RedHat.yml    |  5 ++++
 .../ansible-elasticsearch/tasks/main.yml      | 24 +++++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/molecule/elasticsearch/molecule.yml b/molecule/elasticsearch/molecule.yml
index 585614b2..a7e3c26f 100755
--- a/molecule/elasticsearch/molecule.yml
+++ b/molecule/elasticsearch/molecule.yml
@@ -41,7 +41,7 @@ platforms:
         #    memory_reservation: 1024m
         #    privileged: true
         #    ulimits:
-      - nofile:262144:262144
+        #      - nofile:262144:262144
 provisioner:
   name: ansible
   playbooks:
diff --git a/molecule/elasticsearch/tests/test_default.py b/molecule/elasticsearch/tests/test_default.py
index 8b453255..34fce3b3 100755
--- a/molecule/elasticsearch/tests/test_default.py
+++ b/molecule/elasticsearch/tests/test_default.py
@@ -10,7 +10,7 @@ def test_elasticsearch_is_installed(host):
     """Test if the elasticsearch package is installed."""
     elasticsearch = host.package("elasticsearch")
     assert elasticsearch.is_installed
-    assert elasticsearch.version.startswith('6.7.1')
+    assert elasticsearch.version.startswith('7.1.1')
 
 
 def test_elasticsearch_is_running(host):
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
index 16366dfc..fbefe51e 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/RedHat.yml
@@ -9,6 +9,11 @@
     gpgcheck: true
   changed_when: false
 
+- name: CentOS x.x => x.x < 7.0 | Installing Java
+  yum:
+    name: java-1.8.0-openjdk.x86_64
+    state: present
+
 - name: RedHat/CentOS/Fedora | Install Elasticsarch
   package: name=elasticsearch-{{ elastic_stack_version }} state=present
   tags: install
diff --git a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
index 5ca11b67..c29dc760 100755
--- a/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
+++ b/roles/elastic-stack/ansible-elasticsearch/tasks/main.yml
@@ -205,22 +205,26 @@
     - not (ansible_distribution == "Ubuntu" and ansible_distribution_version is version('15.04', '<'))
     - not (ansible_distribution == "Debian" and ansible_distribution_version is version('8', '<'))
     - not (ansible_os_family == "RedHat" and ansible_distribution_version is version('7', '<'))
-- name: Get Java version
-  shell: java -version |& awk -F'"' '{print $2}'
-  register: java_version
 
-- debug: msg="{{ java_version.stdout_lines }}"
+#- name: Get Java version
+#  shell: java -version |& awk -F'"' '{print $2}'
+#  register: java_version
+#  ignore_errors: true
 
-- name: "Install Java Repo for Trusty"
-  yum_repository: repo='ppa:openjdk-r/ppa'
-  when:
-    - ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int < 7
+# - debug: msg="{{ java_version.stdout_lines }}"
+
+#- name: "Install Java Repo for Trusty"
+#  yum_repository: repo='ppa:openjdk-r/ppa'
+#  when:
+#    - ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version|int < 7
 
 - name: Distribution is centos 6.* | Enable Elasticsearch
   service: name=elasticsearch enabled=yes
 
-- name: Distribution is centos 6.* | Reload Elasticsearch
-  service: name=elasticsearch state=reloaded
+
+#- name: Distribution is centos 6.* | Reload Elasticsearch
+#  service: name=elasticsearch state=reloaded
+#  state: "{{ elasticsearch_state | default('reloaded') }}"
 
 - name: Distribution is centos 6.* | Start Elasticsearch
   service: name=elasticsearch state=started