Java 11 installation - Cover more OS versions

- Debian based: Java 11 for all versions starting with Debian 10 - RedHat based: Java 11 for all versions starting with RHEL 7
elastic · Nov 8, 2021 · 99e377f · 99e377f
1 parent 361c44e
commit 99e377f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/vars/Debian.yml b/vars/Debian.yml
@@ -1,6 +1,6 @@
 ---
-java_version: "{% if ansible_os_family == 'Debian' and ansible_distribution_major_version == '10' %}11{% else %}8{% endif %}"
-java: "{% if es_java is defined %}{{es_java}}{% else %}openjdk-{{ java_version }}-jre-headless{% endif %}"
+java_version: "{{ (ansible_distribution_major_version | int >= 10) | ternary('11', '8') }}"
+java: "{% if es_java is defined %}{{ es_java }}{% else %}openjdk-{{ java_version }}-jre-headless{% endif %}"
 default_file: "/etc/default/elasticsearch"
 es_home: "/usr/share/elasticsearch"
 es_apt_key_id: "46095ACC8548582C1A2699A9D27D666CD88E42B4"
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -1,4 +1,5 @@
 ---
-java: "{{ es_java | default('java-1.8.0-openjdk.x86_64') }}"
+java_version: "{{ (ansible_distribution_major_version | int >= 7) | ternary('11', '1.8.0') }}"
+java: "{% if es_java is defined %}{{ es_java }}{% else %}java-{{ java_version }}-openjdk.x86_64{% endif %}"
 default_file: "/etc/sysconfig/elasticsearch"
 es_home: "/usr/share/elasticsearch"