From 8008001099c2f973d7c2ed52baa5b7a7fa8dceb1 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Mon, 12 Jun 2017 12:49:53 +0200
Subject: Point ubuntu ODL repos to PPA's

PPA repos are maintained by odl-team rather than current
repos under an individual namespace.

Change-Id: I282f81e802df5ec2a0690fff4a37da07275e2d42
---
 docker/base/Dockerfile.j2       | 2 ++
 docker/base/sources.list.ubuntu | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 60603ec5f..a501d6b8d 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -303,6 +303,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> #}
@@ -314,6 +315,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
-- 
cgit v1.2.3