summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Gonzalez <dabarren@gmail.com>2018-09-09 08:13:17 +0200
committerEduardo Gonzalez <dabarren@gmail.com>2018-09-09 16:33:07 +0000
commit444e9e7dc714ee4b9574194358c1ef53e5db074d (patch)
treee587bf3d40c5ecd80846411ed27c25725e5a9691
parent451d0fc023c9a167364cfa15cead808f74d9ac67 (diff)
Pin ODL java version to 8 on ubuntu
Ubuntu default-jre-headless is not working due min version missmatch with karaf. Closes-Bug: #1791531 Change-Id: I67c2d9b2ae514b131a42297fa235071603dc230b
Notes
Notes (review): Code-Review+2: Surya Prakash (spsurya) <singh.surya64mnnit@gmail.com> Code-Review+2: Mark Goddard <mark@stackhpc.com> Workflow+1: Mark Goddard <mark@stackhpc.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 10 Sep 2018 15:27:32 +0000 Reviewed-on: https://review.openstack.org/601044 Project: openstack/kolla Branch: refs/heads/master
-rw-r--r--docker/opendaylight/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2
index 75b0ca1..ed43d2e 100644
--- a/docker/opendaylight/Dockerfile.j2
+++ b/docker/opendaylight/Dockerfile.j2
@@ -16,8 +16,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
16 ] %} 16 ] %}
17{% elif base_distro in ['debian', 'ubuntu'] %} 17{% elif base_distro in ['debian', 'ubuntu'] %}
18 {% set opendaylight_packages = [ 18 {% set opendaylight_packages = [
19 'default-jre-headless',
20 'opendaylight', 19 'opendaylight',
20 'openjdk-8-jre-headless',
21 ] %} 21 ] %}
22 # NOTE(egonzalez): ODL fails to install in debian family images with 22 # NOTE(egonzalez): ODL fails to install in debian family images with
23 # existing odl user. First install odl and then allow usage of 23 # existing odl user. First install odl and then allow usage of