openstack
/
kolla
Code Issues Proposed changes

Merge "Ceph repo has been moved to download.ceph.org"

This commit is contained in:
Jenkins 2016-01-13 07:43:42 +00:00 committed by Gerrit Code Review
parent 5d90d93086 875518eb26
commit e6bb28f1a7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -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'] %}

8
docker/base/ceph.yum.repo
View File

@ -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