diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-17 17:25:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-17 17:25:31 +0000 |
| commit | 6b03992c280f69873072369e3bc2b5c843595fd4 (patch) | |
| tree | 25ddce2cf1fcc4c63bfd8311a636aa8f6721db06 /docker/base | |
| parent | cdd8e67985bcff40ba5b8181be8564077de5f10b (diff) | |
| parent | 8008001099c2f973d7c2ed52baa5b7a7fa8dceb1 (diff) | |
| download | kolla-6b03992c280f69873072369e3bc2b5c843595fd4.tar.gz kolla-6b03992c280f69873072369e3bc2b5c843595fd4.zip | |
Merge "Point ubuntu ODL repos to PPA's"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 |
2 files changed, 5 insertions, 0 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 |