From 060b2053b8d8bb2ea4137643549800bd4102052e Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Mon, 17 Oct 2016 00:06:22 +0800
Subject: [PATCH] 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
---
docker/base/Dockerfile.j2 | 2 --
docker/base/apt_preferences.debian | 4 ----
docker/base/apt_preferences.ubuntu | 3 ---
docker/base/sources.list.ubuntu | 3 ---
4 files changed, 12 deletions(-)
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 6c06d6d8b1..3ea1df7bbc 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',
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 1aa14b1d83..65b9de4675 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -1,7 +1,3 @@
-Package: *
-Pin: origin "download.ceph.com"
-Pin-Priority: 500
-
Package: *
Pin: origin "nyc2.mirrors.digitalocean.com"
Pin-Priority: 500
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index 2edb717d6e..e69de29bb2 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -1,3 +0,0 @@
-Package: *
-Pin: origin download.ceph.com
-Pin-Priority: 700
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index 1fdd647449..17c01b81be 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -16,9 +16,6 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main
# Percona repo (for xtrabackup)
deb http://repo.percona.com/apt xenial main
-# Ceph repo
-deb http://download.ceph.com/debian-jewel/ xenial main
-
# Elastic repo
deb http://packages.elastic.co/elasticsearch/2.x/debian stable main