Merge pull request elastic#29 from jakommo/master

EL package installation from url and Java simplification
ClaudioMFreitas · Jul 31, 2015 · a8f001a · a8f001a
2 parents 2747230 + 138ad32
commit a8f001a
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 34 deletions.
diff --git a/tasks/elasticsearch-RedHat.yml b/tasks/elasticsearch-RedHat.yml
@@ -13,7 +13,7 @@
   register: elasticsearch_install
 
 - name: RedHat - Install Elasticsearch from url
-  yum: name={{ es_package_url }}-{{ es_version }}.noarch.rpm state=present
+  yum: name={% if es_custom_package_url is defined %}{{ es_custom_package_url }}{% else %}{{ es_package_url }}-{{ es_version }}.noarch.rpm{% endif %} state=present
   when: not es_use_repository
   register: elasticsearch_install
 

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/tasks/main.yml b/tasks/main.yml
@@ -1,6 +1,4 @@
 ---
-- name: Include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
 - include: java.yml
 - include: elasticsearch.yml
 - include: elasticsearch-plugins.yml

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"