diff options
| author | Thierry Vignaud <tvignaud@redhat.com> | 2017-08-03 16:34:21 +0200 |
|---|---|---|
| committer | Martin André <m.andre@redhat.com> | 2017-08-03 17:59:27 +0200 |
| commit | 6e58742153d728df31879cbf3bd9fa31203a2f69 (patch) | |
| tree | fd5c4931db25e685440c0f03ca10aaa0619ee630 | |
| parent | f3690aee3213434b2d963688857bc402eeb43668 (diff) | |
| download | kolla-6e58742153d728df31879cbf3bd9fa31203a2f69.tar.gz kolla-6e58742153d728df31879cbf3bd9fa31203a2f69.zip | |
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
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/base/opendaylight.repo (renamed from docker/opendaylight/opendaylight.repo) | 0 | ||||
| -rw-r--r-- | docker/base/sources.list.debian | 3 | ||||
| -rw-r--r-- | docker/opendaylight/Dockerfile.j2 | 17 |
4 files changed, 5 insertions, 16 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 21e7ea17e..5d305411d 100644 --- a/docker/base/Dockerfile.j2 +++ b/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' ] %} diff --git a/docker/opendaylight/opendaylight.repo b/docker/base/opendaylight.repo index 8c0c299fd..8c0c299fd 100644 --- a/docker/opendaylight/opendaylight.repo +++ b/docker/base/opendaylight.repo diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian index 19b16d5fb..e64a50b10 100644 --- a/docker/base/sources.list.debian +++ b/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/ diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index 1b5f76a35..8a005b379 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/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. |