Set the jdk_java_home variable correctly on EL.

This commit is contained in:
Andrea Dell'Amico 2020-07-31 14:54:16 +02:00
parent 2de51771da
commit 223e975ded
3 changed files with 6 additions and 3 deletions

View File

@ -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

View File

@ -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
when: openjdk_install

View File

@ -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' ]