Switch to headless jre

Prefer the headless JRE wherever possible. This may be becessary to
adjust the override files for the customization of the containers where
java is installed.

Change-Id: I3479ac9e74aa9e860cf01db20bd7ab5f5cfc9c1a

1 files changed, 13 insertions, 5 deletions

diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2
index 8a005b379..75b0ca143 100644
--- a/docker/opendaylight/Dockerfile.j2
+++ b/docker/opendaylight/Dockerfile.j2
@@ -9,11 +9,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% block opendaylight_install %}
 
-{% set opendaylight_packages = ['opendaylight'] %}
-{% if base_distro in ['debian', 'ubuntu'] %}
-# 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.
+{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% set opendaylight_packages = [
+        'java-1.8.0-openjdk-headless',
+        'opendaylight',
+    ] %}
+{% elif base_distro in ['debian', 'ubuntu'] %}
+    {% set opendaylight_packages = [
+        'default-jre-headless',
+        'opendaylight',
+    ] %}
+    # 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.
     {% block debian_opendaylight_install_fix_block %}
         {{ macros.debian_opendaylight_existing_user_fix() }}
     {% endblock %}