Browse Source

Move ODL repo enablement into base image

This makes it consistent with the rest of the images and lets kolla
users disable external repo in a clean fashion.

Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: If6d03d2168a14181b7a32d7810b8fe4b1d798585
changes/03/490503/2
Thierry Vignaud 5 years ago committed by Martin André
parent
commit
6e58742153
  1. 1
      docker/base/Dockerfile.j2
  2. 0
      docker/base/opendaylight.repo
  3. 3
      docker/base/sources.list.debian
  4. 17
      docker/opendaylight/Dockerfile.j2

1
docker/base/Dockerfile.j2

@ -66,6 +66,7 @@ COPY yum.conf /etc/yum.conf
'influxdb.repo',
'kibana.yum.repo',
'MariaDB.repo',
'opendaylight.repo',
'td.repo',
'zookeeper.repo'
] %}

0
docker/opendaylight/opendaylight.repo → docker/base/opendaylight.repo

3
docker/base/sources.list.debian

@ -3,3 +3,6 @@ deb http://deb.debian.org/debian stretch main
# debian security updates
deb http://security.debian.org stretch/updates main
# Opendaylight repo
deb http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/

17
docker/opendaylight/Dockerfile.j2

@ -10,22 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block opendaylight_install %}
{% set opendaylight_packages = ['opendaylight'] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if opendaylight_repo is not defined %}
{% set opendaylight_repo = 'opendaylight.repo' %}
{% endif %}
COPY {{ opendaylight_repo }} /etc/yum.repos.d/
{% elif base_distro in ['debian', 'ubuntu'] %}
{% if base_distro in 'debian' %}
{% if odl_release_deb_url is not defined %}
{% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/' %}
{% endif %}
RUN sh -c "echo 'deb {{ odl_release_deb_url }} /' > /etc/apt/sources.list.d/opendaylight.list"
{% endif %}
{% 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.

Loading…
Cancel
Save