openstack
/
kolla
Code Issues Proposed changes

There is no Java 8 in Debian 'buster' (part 2) 

Debian 'buster' release contains Java 11 only. So opendaylight and
monasca-thresh images needed adjustments.

Change-Id: I78f8be44436b8c8e5f58fea40a762c17e6b510a8
(cherry picked from commit e04428f8f5)
This commit is contained in:
Marcin Juszkiewicz 2019-07-16 14:50:15 +02:00 committed by Mark Goddard
parent cd4d4b37be
commit 3272c8cf48
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -24,8 +24,15 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
{% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %}
{% set java_version = '11' %}
{% elif base_distro == 'ubuntu' %}
{% set java_version = '8' %}
{% endif %}
{% set monasca_thresh_packages = [
'openjdk-8-jdk-headless',
'openjdk-' + java_version + '-jdk-headless',
'maven',
] %}

10
docker/opendaylight/Dockerfile.j2
View File

@ -15,10 +15,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'opendaylight',
] %}
{% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %}
{% set java_version = '11' %}
{% elif base_distro == 'ubuntu' %}
{% set java_version = '8' %}
{% endif %}
{% set opendaylight_packages = [
'opendaylight',
'openjdk-8-jre-headless',
'openjdk-' + java_version + '-jre-headless',
] %}
# NOTE(egonzalez): ODL fails to install in debian family images with
# existing odl user. First install odl and then allow usage of
# install_packages macro for custom configs.