From c6fb24f7d871eb32644bb6dc1be12e5b7ffec8b1 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Fri, 30 Sep 2022 11:39:50 +0200
Subject: [PATCH] lxc-solr: use default JRE package

---
 CHANGELOG.md            | 2 +-
 lxc-solr/tasks/solr.yml | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae69cce3..8520f9ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,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: download URL according to Solr Version
 * lxc-solr: detect the real partition options
 * lxc-solr: set homedir and port at install
 
diff --git a/lxc-solr/tasks/solr.yml b/lxc-solr/tasks/solr.yml
index 8ded722e..9e37bf44 100644
--- a/lxc-solr/tasks/solr.yml
+++ b/lxc-solr/tasks/solr.yml
@@ -2,7 +2,6 @@
 
 - name: "Set values for Solr < 9.0.0"
   set_fact:
-    java_package: openjdk-8-jre-headless
     tarball_url: https://archive.apache.org/dist/lucene/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz
     tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
     start_command: "/etc/init.d/solr start"
@@ -11,7 +10,6 @@
 
 - name: "Set values for Solr >= 9.0.0"
   set_fact:
-    java_package: openjdk-11-jre-headless
     tarball_url: https://archive.apache.org/dist/solr/solr/{{ solr_version }}/solr-{{ solr_version }}.tgz
     tarball_path: /var/lib/lxc/{{ name }}/rootfs/root/solr-{{ solr_version }}.tgz
     start_command: "systemctl start solr"
@@ -19,7 +17,7 @@
   when: "solr_version is version('9.0.0', '>=')"
 
 - name: Install java and lsof packages
-  command: "lxc-attach -n {{ name }} -- apt-get install -y {{ java_package }} lsof"
+  command: "lxc-attach -n {{ name }} -- apt-get install -y default-jre-headless lsof"
 
 - name: "Download Solr {{ solr_version }}"
   get_url: