java: use default JRE when version is not specified
This commit is contained in:
parent
6aeaab078d
commit
792d1170ab
|
@ -14,6 +14,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
|
||||||
|
|
||||||
### Changed
|
### 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: choose java package and download URL according to Solr Version
|
||||||
* lxc-solr: detect the real partition options
|
* lxc-solr: detect the real partition options
|
||||||
* lxc-solr: set homedir and port at install
|
* lxc-solr: set homedir and port at install
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
---
|
---
|
||||||
java_alternative: 'openjdk'
|
java_alternative: 'openjdk'
|
||||||
java_version: 8
|
java_version: Null
|
||||||
java_default_alternative: True
|
java_default_alternative: True
|
||||||
|
|
|
@ -13,7 +13,17 @@
|
||||||
tags:
|
tags:
|
||||||
- java
|
- 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:
|
apt:
|
||||||
name: "openjdk-{{ java_version}}-jre-headless"
|
name: "openjdk-{{ java_version}}-jre-headless"
|
||||||
default_release: "{{ java_apt_release }}"
|
default_release: "{{ java_apt_release }}"
|
||||||
|
@ -21,11 +31,14 @@
|
||||||
tags:
|
tags:
|
||||||
- java
|
- java
|
||||||
- packages
|
- packages
|
||||||
|
when: java_version is not none
|
||||||
|
|
||||||
- name: This openjdk version is the default alternative
|
- name: This openjdk version is the default alternative
|
||||||
alternatives:
|
alternatives:
|
||||||
name: java
|
name: java
|
||||||
path: "{{ java_bin_path[java_version] }}"
|
path: "{{ java_bin_path[java_version] }}"
|
||||||
when: java_default_alternative | bool
|
|
||||||
tags:
|
tags:
|
||||||
- java
|
- java
|
||||||
|
when:
|
||||||
|
- java_default_alternative | bool
|
||||||
|
- java_version is not none
|
||||||
|
|
Loading…
Reference in New Issue