Removed java list functionality, Closes elastic#22. Simplified whole …

…java task.
ClaudioMFreitas · Jul 31, 2015 · 441d323 · 441d323
1 parent 2e7a21f
commit 441d323
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 31 deletions.
diff --git a/tasks/java-Debian.yml b/tasks/java-Debian.yml
diff --git a/tasks/java-RedHat.yml b/tasks/java-RedHat.yml
diff --git a/tasks/java.yml b/tasks/java.yml
@@ -1,15 +1,8 @@
 ---
-- name: Java - Define java_packages
-  set_fact:
-    java_packages: "{{ __java_packages | list }}"
-  when: java_packages is not defined  
-
-- name: Include Debian specific Java stuff
-  include: java-Debian.yml
-  when: ansible_os_family == 'Debian'
-
-- name: Include RedHat specific Java stuff
-  include: java-RedHat.yml
+- name: RedHat - Ensure Java is installed
+  yum: name={{ java_rhel }} state=latest
   when: ansible_os_family == 'RedHat'
-
-
+
+- name: Debian - Ensure Java is installed
+  apt: name={{ java_debian }} state=present update_cache=yes
+  when: ansible_os_family == 'Debian'
diff --git a/vars/Debian.yml b/vars/Debian.yml
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
diff --git a/vars/main.yml b/vars/main.yml
@@ -1,2 +1,4 @@
 ---
-es_package_url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch"
+java_debian: "openjdk-7-jre-headless"
+java_rhel: "java-1.8.0-openjdk.x86_64"
+es_package_url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch"