Merge "Point ubuntu ODL repos to PPA's"

3 files changed, 12 insertions, 11 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 727afa206..21e7ea17e 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -306,6 +306,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
     {# 391A9AA2147192839E9DB0315EDB1B62EC4926EA -- Canonical Cloud Archive Signing Key <ftpmaster@canonical.com> #}
     {# 418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB -- packagecloud ops (production key) <ops@packagecloud.io> #}
     {# 46095ACC8548582C1A2699A9D27D666CD88E42B4 -- Elasticsearch (Elasticsearch Signing Key) <dev_ops@elasticsearch.org> #}
+    {# 49B07274951063870A8B7EAE7B8AA1A344C05248 -- Opendaylight Signing Key <https://launchpad.net/~odl-team> #}
     {# 4D1BB29D63D98E422B2113B19334A25F8507EFA5 -- Percona MySQL Development Team (Packaging key) <mysql-dev@percona.com> #}
     {# 58118E89F3A912897C070ADBF76221572C52609D -- Docker Release Tool (releasedocker) <docker@docker.com> #}
     {# 4D8EB5FDA37AB55F41A135203BF88A0C6A770882 -- Apache Qpid PPA Signing Key <dev@qpid.apache.org> #}
@@ -317,6 +318,7 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '418A7F2FB0E1E6E7EABF6FE8C2E73424D59097AB',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
+      '49B07274951063870A8B7EAE7B8AA1A344C05248',
       '4D1BB29D63D98E422B2113B19334A25F8507EFA5',
       '58118E89F3A912897C070ADBF76221572C52609D',
       '4D8EB5FDA37AB55F41A135203BF88A0C6A770882',
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index f02536273..91db09b9f 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -41,3 +41,6 @@ deb http://ppa.launchpad.net/qpid/released/ubuntu/ xenial main
 
 # Sensu repo
 deb https://sensu.global.ssl.fastly.net/apt xenial main
+
+# Opendaylight repo
+deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2
index 311f8ffdc..7551c3ce7 100644
--- a/docker/opendaylight/Dockerfile.j2
+++ b/docker/opendaylight/Dockerfile.j2
@@ -16,23 +16,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
       {% endif %}
 COPY {{ opendaylight_repo }} /etc/yum.repos.d/
 
-    {% elif base_distro in ['ubuntu', 'debian'] %}
-      {% if odl_release_deb_url is not defined %}
-        {% if base_distro in 'ubuntu' %}
-          {% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/xUbuntu_16.04/' %}
-        {% elif base_distro in 'debian' %}
-          {% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/' %}
-        {% endif %}
-      {% endif %}
+    {% 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 %}
 
 # 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.
         {% block debian_opendaylight_install_fix_block %}
-        {% if base_distro in ['debian', 'ubuntu'] %}
-          {{ macros.debian_opendaylight_existing_user_fix() }}
-        {% endif %}
+            {{ macros.debian_opendaylight_existing_user_fix() }}
         {% endblock %}
     {% endif %}