aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-17 16:20:58 +0000
committerGerrit Code Review <review@openstack.org>2016-10-17 16:20:58 +0000
commit51f46035e73f52b0a9b9e32fb04688a4eafbb497 (patch)
tree8f825783e7425339352fbe676f58e8c305cbfefb /docker/base/Dockerfile.j2
parent19b0173b0dd852b1bdf22c850842caaf13ea0425 (diff)
parent060b2053b8d8bb2ea4137643549800bd4102052e (diff)
downloadkolla-51f46035e73f52b0a9b9e32fb04688a4eafbb497.tar.gz
kolla-51f46035e73f52b0a9b9e32fb04688a4eafbb497.zip
Merge "Remove ceph repo for Ubuntu install"
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j22
1 files changed, 0 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 6c06d6d8b..3ea1df7bb 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -235,7 +235,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'0xF1656F24C74CD1D8',
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A',
- '08B73419AC32B4E966C1A330E84AC2C0460F3994',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'58118E89F3A912897C070ADBF76221572C52609D',
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
@@ -243,7 +242,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
] %}
{% elif base_distro == 'debian' %}
{% set base_apt_keys = [
- '08B73419AC32B4E966C1A330E84AC2C0460F3994',
'58118E89F3A912897C070ADBF76221572C52609D',
'0xcbcb082a1bb943db',
'D27D666CD88E42B4',