From 6e58742153d728df31879cbf3bd9fa31203a2f69 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@redhat.com>
Date: Thu, 3 Aug 2017 16:34:21 +0200
Subject: [PATCH] Move ODL repo enablement into base image
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 docker/base/Dockerfile.j2                       |  1 +
 docker/{opendaylight => base}/opendaylight.repo |  0
 docker/base/sources.list.debian                 |  3 +++
 docker/opendaylight/Dockerfile.j2               | 17 +----------------
 4 files changed, 5 insertions(+), 16 deletions(-)
 rename docker/{opendaylight => base}/opendaylight.repo (100%)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 21e7ea17ee..5d305411db 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
similarity index 100%
rename from docker/opendaylight/opendaylight.repo
rename to docker/base/opendaylight.repo
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index 19b16d5fb5..e64a50b109 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 1b5f76a352..8a005b379a 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.