tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the OpenJDK playbook.

This commit is contained in:
Andrea Dell'Amico 2017-08-28 19:20:50 +02:00
parent b4cb0771c8
commit 0dc8227536
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openjdk/defaults/main.yml
View File

@ -9,7 +9,7 @@ openjdk_ppa: 'ppa:openjdk-r/ppa'
jdk_java_home: '/usr/lib/jvm/java-{{ openjdk_default }}-openjdk-amd64' jdk_java_home: '/usr/lib/jvm/java-{{ openjdk_default }}-openjdk-amd64'
openjdk_pkgs: openjdk_pkgs:
- jre - jre-headless
- jdk - jdk-headless
# - jre-headless # - jre
# - jdk-headless # - jdk

6
openjdk/tasks/main.yml
View File

@ -3,12 +3,8 @@
- name: Add the openjdk ppa. To have openjdk 8/9 on precise and trusty - name: Add the openjdk ppa. To have openjdk 8/9 on precise and trusty
apt_repository: repo='{{ openjdk_ppa }}' update_cache=yes apt_repository: repo='{{ openjdk_ppa }}' update_cache=yes
- name: Update the apt cache, if needed
apt: update_cache=yes cache_valid_time=1800
when: openjdk_pkg_state == 'latest'
- name: install OpenJDK JRE - name: install OpenJDK JRE
apt: pkg=openjdk-{{ item.0 }}-{{ item[1] }} state={{ openjdk_pkg_state }} apt: pkg=openjdk-{{ item.0 }}-{{ item[1] }} state={{ openjdk_pkg_state }} update_cache=yes cache_valid_time=3600
with_nested: with_nested:
- '{{ openjdk_version }}' - '{{ openjdk_version }}'
- '{{ openjdk_pkgs }}' - '{{ openjdk_pkgs }}'