openstack
/
kolla
Code Issues Proposed changes

Merge "Pin ODL java version to 8 on ubuntu"

This commit is contained in:
Zuul 2018-09-10 15:27:32 +00:00 committed by Gerrit Code Review
parent bbab10815c 444e9e7dc7
commit a4187d9d02
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/opendaylight/Dockerfile.j2
View File

@ -16,8 +16,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set opendaylight_packages = [ {% set opendaylight_packages = [
'default-jre-headless',
'opendaylight', 'opendaylight',
'openjdk-8-jre-headless',
] %} ] %}
# NOTE(egonzalez): ODL fails to install in debian family images with # NOTE(egonzalez): ODL fails to install in debian family images with
# existing odl user. First install odl and then allow usage of # existing odl user. First install odl and then allow usage of