diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-14 10:58:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-14 10:58:08 +0000 |
| commit | 0545701d0d4bfda60a5e4459a6bd3ef58887075b (patch) | |
| tree | e6cff85ddc427a059a5a1efb17a276f1cfc7f0fe /docker/base | |
| parent | e47d4b8506e990c3f466676a1108de1d1b7ece40 (diff) | |
| parent | 1353538644253081f62a6a74e299d102aa9965dd (diff) | |
| download | kolla-0545701d0d4bfda60a5e4459a6bd3ef58887075b.tar.gz kolla-0545701d0d4bfda60a5e4459a6bd3ef58887075b.zip | |
Merge "Make Ceph work for RPM based distributions"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/ceph.yum.repo | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index a9d576be4..502103d4e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -42,6 +42,8 @@ ENV KOLLA_INSTALL_METATYPE {{ install_metatype }} # Turns on MariaDB repos throughout the RPM build COPY mariadb.yum.repo /etc/yum.repos.d/MariaDB.repo +COPY ceph.yum.repo /etc/yum.repos.d/ceph.repo + RUN yum install -y http://www.percona.com/redir/downloads/percona-release/redhat/0.1-3/percona-release-0.1-3.noarch.rpm \ && sed -i 's|$releasever|centos/latest|g' /etc/yum.repos.d/percona-release.repo diff --git a/docker/base/ceph.yum.repo b/docker/base/ceph.yum.repo new file mode 100644 index 000000000..131e01a4c --- /dev/null +++ b/docker/base/ceph.yum.repo @@ -0,0 +1,15 @@ +[ceph-x86_64] +name=Ceph x86_64 packages +baseurl=http://ceph.com/rpm-hammer/el7/x86_64 +enabled=1 +gpgcheck=1 +type=rpm-md +gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc + +[ceph-noarch] +name=Ceph noarch packages +baseurl=http://ceph.com/rpm-hammer/el7/noarch +enabled=1 +gpgcheck=1 +type=rpm-md +gpgkey=https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc |