From 6d0cd535d34ac10f144ab5d909256364363e7f38 Mon Sep 17 00:00:00 2001
From: SamYaple <sam@yaple.net>
Date: Sat, 19 Mar 2016 02:48:22 +0000
Subject: Allow user to choose filesystem for osd

Change-Id: I9c770a08219d2eead5ece8e3462157359cd920cb
Partially-Implements: blueprint ceph-improvements
---
 docker/ceph/ceph-base/Dockerfile.j2  | 2 ++
 docker/ceph/ceph-osd/extend_start.sh | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'docker')

diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2
index c51cad819..4787448f8 100644
--- a/docker/ceph/ceph-base/Dockerfile.j2
+++ b/docker/ceph/ceph-base/Dockerfile.j2
@@ -8,6 +8,7 @@ RUN yum -y install \
         ceph-radosgw \
         parted \
         hdparm \
+        btrfs-progs \
     && yum clean all
 
 {% elif base_distro in ['ubuntu', 'debian'] %}
@@ -17,6 +18,7 @@ RUN apt-get install -y --no-install-recommends \
         radosgw \
         parted \
         hdparm \
+        btrfs-tools \
     && apt-get clean
 
 {% endif %}
diff --git a/docker/ceph/ceph-osd/extend_start.sh b/docker/ceph/ceph-osd/extend_start.sh
index 7c1e479c0..5db6f61c9 100644
--- a/docker/ceph/ceph-osd/extend_start.sh
+++ b/docker/ceph/ceph-osd/extend_start.sh
@@ -29,7 +29,14 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     OSD_ID=$(ceph osd create)
     OSD_DIR="/var/lib/ceph/osd/ceph-${OSD_ID}"
     mkdir -p "${OSD_DIR}"
-    mkfs.xfs -f "${OSD_PARTITION}"
+
+    if [[ "${OSD_FILESYSTEM}" == "btrfs" ]]; then
+        mkfs.btrfs -f "${OSD_PARTITION}"
+    elif [[ "${OSD_FILESYSTEM}" == "ext4" ]]; then
+        mkfs.ext4 "${OSD_PARTITION}"
+    else
+        mkfs.xfs -f "${OSD_PARTITION}"
+    fi
     mount "${OSD_PARTITION}" "${OSD_DIR}"
 
     # This will through an error about no key existing. That is normal. It then
-- 
cgit v1.2.3