aboutsummaryrefslogtreecommitdiff
path: root/docker/base
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-10-13 03:56:20 -0400
committerSteven Dake <stdake@cisco.com>2015-10-13 21:48:17 -0400
commit1353538644253081f62a6a74e299d102aa9965dd (patch)
treef34365df52e1be7c5953424b40a444eb7056de5c /docker/base
parentba3b1bcf90549e276f8f6d94b38c9b1c8816b2ed (diff)
downloadkolla-1353538644253081f62a6a74e299d102aa9965dd.tar.gz
kolla-1353538644253081f62a6a74e299d102aa9965dd.zip
Make Ceph work for RPM based distributions
Ceph packages need to be installed in nova, glance, and cinder. Once that is done, Ceph works like a champ! Change-Id: I296da1d04d0c1bcb729f22e65e432d53d561b49c backport: liberty Closes-Bug: #1505549
Diffstat (limited to 'docker/base')
-rw-r--r--docker/base/Dockerfile.j22
-rw-r--r--docker/base/ceph.yum.repo15
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