diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-13 07:43:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-13 07:43:43 +0000 |
| commit | e6bb28f1a7643957d8f2ba6d516f55600efb620f (patch) | |
| tree | e70810bac65ad7acd8a037e2ce234f429c53ba5d /docker | |
| parent | 5d90d930868ff10ca10565ec6ce439ec2743c3f5 (diff) | |
| parent | 875518eb263871f92aabe93b463164f23b7db2e4 (diff) | |
| download | kolla-e6bb28f1a7643957d8f2ba6d516f55600efb620f.tar.gz kolla-e6bb28f1a7643957d8f2ba6d516f55600efb620f.zip | |
Merge "Ceph repo has been moved to download.ceph.org"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/ceph.yum.repo | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 59b8f2429..f1be05b36 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 |