aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2016-01-11 21:25:53 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2016-01-13 12:16:46 +0800
commit875518eb263871f92aabe93b463164f23b7db2e4 (patch)
tree05a7400da77e8432fe7bf9d8b58f88fbb861f401
parentd33931ca1080918598d85bad56f13d02e9962ad4 (diff)
downloadkolla-875518eb263871f92aabe93b463164f23b7db2e4.tar.gz
kolla-875518eb263871f92aabe93b463164f23b7db2e4.zip
Ceph repo has been moved to download.ceph.org
Ceph has move it repo to download.ceph.org[0]. Actually, http://ceph.com/rpm-hammer return a http 301 code now. [0] http://docs.ceph.com/docs/master/install/get-packages/#add-ceph TrivalFix Change-Id: I304f9e231c32f63e13d4a5b889412799c39f4d7e
-rw-r--r--docker/base/Dockerfile.j22
-rw-r--r--docker/base/ceph.yum.repo8
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 6cf31a796..a82f545f4 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -49,7 +49,7 @@ COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo
RUN yum -y install http://repo.percona.com/release/7/RPMS/x86_64/percona-release-0.1-3.noarch.rpm
RUN rpm --import https://yum.mariadb.org/RPM-GPG-KEY-MariaDB \
- && rpm --import https://raw.githubusercontent.com/ceph/ceph/master/keys/release.asc \
+ && rpm --import https://download.ceph.com/keys/release.asc \
&& rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-Percona
{% if install_metatype in ['rdo', 'mixed'] %}
diff --git a/docker/base/ceph.yum.repo b/docker/base/ceph.yum.repo
index 51fbef426..91bb2ecf6 100644
--- a/docker/base/ceph.yum.repo
+++ b/docker/base/ceph.yum.repo
@@ -1,19 +1,19 @@
[ceph-x86_64]
name=Ceph x86_64 packages
-baseurl=http://ceph.com/rpm-hammer/el7/x86_64
+baseurl=http://download.ceph.com/rpm-hammer/el7/x86_64
enabled=1
priority=2
gpgcheck=1
type=rpm-md
-gpgkey=https://raw.githubusercontent.com/ceph/ceph/master/keys/release.asc
+gpgkey=https://download.ceph.com/keys/release.asc
timeout=90
[ceph-noarch]
name=Ceph noarch packages
-baseurl=http://ceph.com/rpm-hammer/el7/noarch
+baseurl=http://download.ceph.com/rpm-hammer/el7/noarch
enabled=1
priority=2
gpgcheck=1
type=rpm-md
-gpgkey=https://raw.githubusercontent.com/ceph/ceph/master/keys/release.asc
+gpgkey=https://download.ceph.com/keys/release.asc
timeout=90