From e4097fa045c5787024c0addbb3db19452ab37dc6 Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <adellam@isti.cnr.it>
Date: Fri, 30 Sep 2016 18:36:33 +0200
Subject: [PATCH] library/roles/openjdk: Some fixes. Install the 'headless'
 version of jre/jdk.

---
 openjdk/defaults/main.yml |  9 +++++++--
 openjdk/handlers/main.yml |  4 ++--
 openjdk/tasks/main.yml    | 31 +++++++++++++++++--------------
 3 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/openjdk/defaults/main.yml b/openjdk/defaults/main.yml
index 7268d2f1..cb012169 100644
--- a/openjdk/defaults/main.yml
+++ b/openjdk/defaults/main.yml
@@ -1,8 +1,13 @@
 ---
-openjdk_default: 7
-openjdk_pkg_state: installed
+openjdk_default: 8
+openjdk_pkg_state: latest
 openjdk_version:
   - '{{ openjdk_default }}'
 
+openjdk_ppa: 'ppa:openjdk-r/ppa'
+
 jdk_java_home: '/usr/lib/jvm/java-{{ openjdk_default }}-openjdk-amd64'
 
+openjdk_pkgs:
+  - jre-headless
+  - jdk-headless
diff --git a/openjdk/handlers/main.yml b/openjdk/handlers/main.yml
index 94fd652f..614db794 100644
--- a/openjdk/handlers/main.yml
+++ b/openjdk/handlers/main.yml
@@ -9,6 +9,6 @@
   shell: update-java-alternatives -s java-1.8.0-openjdk-amd64
 
 - name: Set the default OpenJDK
-  shell: update-java-alternatives -s java-'{{ item }}'-openjdk-amd64
-  with_items: openjdk_default
+  shell: update-java-alternatives -s java-1.{{ item }}.0-openjdk-amd64
+  with_items: '{{ openjdk_default }}'
 
diff --git a/openjdk/tasks/main.yml b/openjdk/tasks/main.yml
index 3ee29333..c64cf22c 100644
--- a/openjdk/tasks/main.yml
+++ b/openjdk/tasks/main.yml
@@ -1,18 +1,21 @@
 ---
-- name: Update the apt cache, if needed
-  apt: update_cache=yes
-  when: openjdk_pkg_state == 'latest'
-  tags: jdk
+- block:
+    - name: Add the openjdk ppa. To have openjdk 8/9 on precise and trusty
+      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
-  apt: pkg=openjdk-{{ item.0 }}-{{ item[1] }} state={{ openjdk_pkg_state }}
-  with_nested:
-    - '{{ openjdk_version }}'
-    - [ 'jre', 'jre-headless', 'jdk' ]
-  notify: Set the default OpenJDK
-  tags: jdk
+    - name: install OpenJDK JRE
+      apt: pkg=openjdk-{{ item.0 }}-{{ item[1] }} state={{ openjdk_pkg_state }}
+      with_nested:
+        - '{{ openjdk_version }}'
+        - '{{ openjdk_pkgs }}'
+        #    - [ 'jre', 'jre-headless', 'jdk' ]
+      notify: Set the default OpenJDK
 
-- name: Set fact jdk_installed
-  set_fact: jdk_installed=true
-  tags: jdk
+    - name: Set fact jdk_installed
+      set_fact: jdk_installed=true
 
+  tags: [ 'jdk', 'openjdk' ]