diff options
| author | Jeffrey Zhang <zhang.lei.fly@gmail.com> | 2016-10-17 00:06:22 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-10-16 16:28:48 +0000 |
| commit | 060b2053b8d8bb2ea4137643549800bd4102052e (patch) | |
| tree | 830b15eee9c68abe556be6f40d438dafd419c9ad /docker/base/Dockerfile.j2 | |
| parent | 57203424c2cfaee5b0bb52ebb2b12053d0e7f266 (diff) | |
| download | kolla-060b2053b8d8bb2ea4137643549800bd4102052e.tar.gz kolla-060b2053b8d8bb2ea4137643549800bd4102052e.zip | |
Remove ceph repo for Ubuntu install
Ubuntu cloud archive provides ceph jewel now. Remove ceph official repo
for the wrong dependency when installing ceph.
Change-Id: I5be6b18c4250733ed9ab4f526fcdc45eb84f8342
Closes-Bug: #1633888
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
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', |