Merge pull request #1 from rhythmictech/ENGFEC-107

Add support for amazon-corretto java provider

Author: dgoodellrhy

defaults/main.yml

@@ -3,9 +3,12 @@
 #  - 1.7.0
 #  - 1.8.0
 #  - 11 (OpenJDK only)
-java_version: 1.8.0
+java_versions:
+  - "1.8.0"
+  
+java_default_version: "1.8.0"
 
-# openjdk or oracle
+# openjdk, oracle or amazon-corretto
 java_provider: openjdk
 
 # install developer tools if using OpenJDK

tasks/jdk_x64.yml

@@ -1,29 +1,25 @@
 ---
-- name: install java rpm
-  yum: name=['java-{{ java_version }}-{{ java_provider }}','javapackages-tools'] state=installed disable_excludes=all lock_timeout=180
-  when: java_use_ansible_yum
-  tags: ['java']
-
-- name: install OpenJDK devel tools
-  yum: name='java-{{ java_version }}-openjdk-devel' state=installed disable_excludes=all lock_timeout=180
-  when:
-   - java_install_devel
-   - java_use_ansible_yum
-  tags: ['java']
 
 - name: install java rpm
-  command: "yum --disableexcludes=all install -y java-{{ java_version }}-{{ java_provider }} javapackages-tools"
-  when: not java_use_ansible_yum
+  yum: 
+    name: ['java-{{ item }}-{{ java_provider }}','javapackages-tools']
+    state: installed
+    disable_excludes: all 
+    lock_timeout: 180
+  with_items: "{{ java_versions }}"
   tags: ['java']
 
 - name: install OpenJDK devel tools
-  command: "yum --disableexcludes=all install -y java-{{ java_version }}-openjdk-devel"
+  yum: 
+    name: ['java-{{ java_version }}-{{ java_provider }}-devel']
+    state: installed
+    disable_excludes: all 
+    lock_timeout: 180
+  with_items: "{{ java_versions }}"
   when:
    - java_install_devel
-   - not java_use_ansible_yum
   tags: ['java']
 
-
 - name: place ld config for OpenJDK
   template:
     src: 'etc.ld.so.conf.d.java.conf.j2'

tasks/main.yml

@@ -1,10 +1,10 @@
 ---
 - name: ensure jdk x64 is installed
-  include: jdk_x64.yml
+  include_tasks: jdk_x64.yml
   when: java_x64|bool
   tags: ['java']
 
 - name: ensure jdk x86 is installed
-  include: jdk_x86.yml
+  include_tasks: jdk_x86.yml
   when: not java_x64|bool
   tags: ['java']

templates/etc.ld.so.conf.d.java.conf.j2

@@ -2,8 +2,16 @@
 {% if java_provider == 'oracle' %}
 /usr/java/default/jre/lib/amd64
 /usr/java/default/jre/lib/amd64/server
+{% elif java_provider == 'amazon-corretto' %}
+{% if java_default_version is version('1.8.0', '==') %}
+/usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64/jre/lib/amd64
+/usr/lib/jvm/java-1.8.0-amazon-corretto.x86_64/jre/lib/amd64/server
 {% else %}
-{% if java_version is version('1.8.0', '>')  %}
+/usr/lib/jvm/java-{{ java_default_version }}-amazon-corretto.x86_64/lib/
+/usr/lib/jvm/java-{{ java_default_version }}-amazon-corretto.x86_64/lib/server
+{% endif %}
+{% else %}
+{% if java_default_version is version('1.8.0', '>') %}
 /usr/lib/jvm/jre/lib
 /usr/lib/jvm/jre/lib/server
 {% else %}