From 223e975ded74d41d55c6372316977a1d13bea962 Mon Sep 17 00:00:00 2001 From: Andrea Dell'Amico Date: Fri, 31 Jul 2020 14:54:16 +0200 Subject: [PATCH] Set the jdk_java_home variable correctly on EL. --- defaults/main.yml | 2 +- handlers/main.yml | 4 ++-- tasks/openjdk_el.yml | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 34a07e4..22e9fa9 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -12,7 +12,7 @@ openjdk_zulu_repo_key_id: '0xB1998361219BD9C9' openjdk_zulu_repository: 'deb http://repos.azulsystems.com/{{ ansible_distribution | lower }} stable main' openjdk_java_home: '/usr/lib/jvm/java-{{ openjdk_default }}-openjdk-amd64' jdk_java_home: '{{ openjdk_java_home }}' -# jdk_java_home: '/usr/lib/jvm/java-{{ openjdk_el_default_version }}-openjdk' +# jdk_java_home: '/usr/lib/jvm/java' openjdk_zulu_java_home: '/usr/lib/jvm/zulu-{{ openjdk_default }}-amd64' openjdk_zulu_package_name: zulu diff --git a/handlers/main.yml b/handlers/main.yml index 37a7ba2..cda4bc5 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,5 +1,5 @@ --- - name: Set the default OpenJDK - alternatives: name={{ item }} path={{ jdk_java_home }}/bin/{{ item }} + alternatives: name={{ item }} path=/usr/lib/jvm/java-{{ openjdk_el_default_version }}-openjdk/bin/{{ item }} with_items: '{{ openjdk_commands }}' - when: openjdk_install \ No newline at end of file + when: openjdk_install diff --git a/tasks/openjdk_el.yml b/tasks/openjdk_el.yml index 0f1b047..f37b581 100644 --- a/tasks/openjdk_el.yml +++ b/tasks/openjdk_el.yml @@ -10,6 +10,9 @@ - name: Set fact jdk_installed set_fact: jdk_installed=true + - name: Set the correct jdk_home variable + set_fact: jdk_java_home='/usr/lib/jvm/java' + when: openjdk_install | bool tags: [ 'jdk', 'openjdk' ]