Merge "Move ODL repo enablement into base image"

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'
     ] %}

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/

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.