Removed java list functionality, Closes #22. Simplified whole java task.

This commit is contained in:
Jakob Reiter 2015-07-31 11:34:09 +02:00
parent 2e7a21f31d
commit 441d3238cf
6 changed files with 9 additions and 31 deletions

View file

@ -1,5 +0,0 @@
---
# Debian specific Java
- name: Debian - Ensure Java is installed
apt: name={{ item }} state=present update_cache=yes
with_items: java_packages

View file

@ -1,6 +0,0 @@
---
# RedHat specific Java
- name: RedHat - Ensure Java is installed
yum: name={{ item }} state=latest
with_items: java_packages

View file

@ -1,15 +1,8 @@
--- ---
- name: Java - Define java_packages - name: RedHat - Ensure Java is installed
set_fact: yum: name={{ java_rhel }} state=latest
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
when: ansible_os_family == 'RedHat' 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'

View file

@ -1,3 +0,0 @@
---
__java_packages:
- "openjdk-7-jre-headless"

View file

@ -1,3 +0,0 @@
---
__java_packages:
- "java-1.8.0-openjdk.x86_64"

View file

@ -1,2 +1,4 @@
--- ---
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" es_package_url: "https://download.elastic.co/elasticsearch/elasticsearch/elasticsearch"