From 792d1170ab128ef8d6c53641abf8c36ed81a8f7f Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Fri, 30 Sep 2022 11:38:53 +0200 Subject: [PATCH] java: use default JRE when version is not specified --- CHANGELOG.md | 1 + java/defaults/main.yml | 2 +- java/tasks/openjdk.yml | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 289ec68c..ae69cce3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Changed +* java: use default JRE package when version is not specified * lxc-solr: choose java package and download URL according to Solr Version * lxc-solr: detect the real partition options * lxc-solr: set homedir and port at install diff --git a/java/defaults/main.yml b/java/defaults/main.yml index 89f5cdac..b28fd4a5 100644 --- a/java/defaults/main.yml +++ b/java/defaults/main.yml @@ -1,4 +1,4 @@ --- java_alternative: 'openjdk' -java_version: 8 +java_version: Null java_default_alternative: True diff --git a/java/tasks/openjdk.yml b/java/tasks/openjdk.yml index b41db0a7..4af3cec1 100644 --- a/java/tasks/openjdk.yml +++ b/java/tasks/openjdk.yml @@ -13,7 +13,17 @@ tags: - java -- name: Install openjdk package +- name: Install default openjdk package + apt: + name: "default-jre-headless" + default_release: "{{ java_apt_release }}" + state: present + tags: + - java + - packages + when: java_version is none + +- name: Install specific openjdk package apt: name: "openjdk-{{ java_version}}-jre-headless" default_release: "{{ java_apt_release }}" @@ -21,11 +31,14 @@ tags: - java - packages + when: java_version is not none - name: This openjdk version is the default alternative alternatives: name: java path: "{{ java_bin_path[java_version] }}" - when: java_default_alternative | bool tags: - java + when: + - java_default_alternative | bool + - java_version is not none