From 1353538644253081f62a6a74e299d102aa9965dd Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 13 Oct 2015 03:56:20 -0400
Subject: 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
---
 docker/base/Dockerfile.j2 |  2 ++
 docker/base/ceph.yum.repo | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 docker/base/ceph.yum.repo

(limited to 'docker/base')

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
-- 
cgit v1.2.3