From 52fee2fbb820c538bca221085dc2e24da76fab11 Mon Sep 17 00:00:00 2001
From: "younes.ouadi" <younes.ouadi@gmail.com>
Date: Fri, 9 Feb 2018 19:37:45 +0000
Subject: [PATCH] elasticsearch: add condition to whether or not install java.

---
 ansible-role-elasticsearch/defaults/main.yml |  1 +
 ansible-role-elasticsearch/tasks/Debian.yml  | 20 ++++++++-------
 ansible-role-elasticsearch/tasks/RedHat.yml  | 26 +++++++++++---------
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/ansible-role-elasticsearch/defaults/main.yml b/ansible-role-elasticsearch/defaults/main.yml
index 23f1b76d..b7de910b 100644
--- a/ansible-role-elasticsearch/defaults/main.yml
+++ b/ansible-role-elasticsearch/defaults/main.yml
@@ -7,3 +7,4 @@ elasticsearch_jvm_xms: null
 elastic_stack_version: 6.1.2
 elasticsearch_shards: 5
 elasticsearch_replicas: 1
+elasticsearch_install_java: yes
diff --git a/ansible-role-elasticsearch/tasks/Debian.yml b/ansible-role-elasticsearch/tasks/Debian.yml
index c0f1603b..d6e3a7e1 100644
--- a/ansible-role-elasticsearch/tasks/Debian.yml
+++ b/ansible-role-elasticsearch/tasks/Debian.yml
@@ -10,16 +10,18 @@
     repo: 'ppa:webupd8team/java'
     codename: 'xenial'
 
-- name: Debian/Ubuntu | Accept Oracle Java 8 license
-  debconf:
-    name: oracle-java8-installer
-    question: shared/accepted-oracle-license-v1-1
-    value: true
-    vtype: boolean
+- when: elasticsearch_install_java
+  block:
+    - name: Debian/Ubuntu | Accept Oracle Java 8 license
+      debconf:
+        name: oracle-java8-installer
+        question: shared/accepted-oracle-license-v1-1
+        value: true
+        vtype: boolean
 
-- name: Debian/Ubuntu | Oracle Java 8 installer
-  apt: name=oracle-java8-installer state=present update_cache=yes
-  tags: install
+    - name: Debian/Ubuntu | Oracle Java 8 installer
+      apt: name=oracle-java8-installer state=present update_cache=yes
+      tags: install
 
 - name: Debian/Ubuntu | Add Elasticsearch GPG key.
   apt_key:
diff --git a/ansible-role-elasticsearch/tasks/RedHat.yml b/ansible-role-elasticsearch/tasks/RedHat.yml
index 35e5b74e..75aa7c52 100644
--- a/ansible-role-elasticsearch/tasks/RedHat.yml
+++ b/ansible-role-elasticsearch/tasks/RedHat.yml
@@ -1,16 +1,18 @@
 ---
-- name: RedHat/CentOS/Fedora | download Oracle Java RPM
-  get_url:
-    url: http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/jre-8u161-linux-x64.rpm
-    dest: /tmp/jdk-8-linux-x64.rpm
-    headers: 'Cookie:oraclelicense=accept-securebackup-cookie'
-  register: oracle_java_task_rpm_download
+- when: elasticsearch_install_java
+  block:
+    - name: RedHat/CentOS/Fedora | download Oracle Java RPM
+      get_url:
+        url: http://download.oracle.com/otn-pub/java/jdk/8u161-b12/2f38c3b165be4555a1fa6e98c45e0808/jre-8u161-linux-x64.rpm
+        dest: /tmp/jdk-8-linux-x64.rpm
+        headers: 'Cookie:oraclelicense=accept-securebackup-cookie'
+      register: oracle_java_task_rpm_download
 
-- name: RedHat/CentOS/Fedora | Install Oracle Java RPM
-  package: name=/tmp/jdk-8-linux-x64.rpm state=present
-  when: oracle_java_task_rpm_download is defined
-  register: oracle_java_task_rpm_installed
-  tags: install
+    - name: RedHat/CentOS/Fedora | Install Oracle Java RPM
+      package: name=/tmp/jdk-8-linux-x64.rpm state=present
+      when: oracle_java_task_rpm_download is defined
+      register: oracle_java_task_rpm_installed
+      tags: install
 
 - name: RedHat/CentOS/Fedora | Install Elastic repo
   yum_repository:
@@ -22,5 +24,5 @@
 
 - name: RedHat/CentOS/Fedora | Install Elasticsarch
   package: name=elasticsearch-{{ elastic_stack_version }} state=present
-  when: oracle_java_task_rpm_installed is defined
+  when: not elasticsearch_install_java or oracle_java_task_rpm_installed is defined
   tags: install