diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-21 09:26:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-21 09:26:14 +0000 |
| commit | 25af34ce7423f7aee2f14d1c7a194642ed72a1c2 (patch) | |
| tree | 9a6d7de294dd81c24ba6b3a8bede544acf947b9f /docker | |
| parent | 39ac7fab7b4398ad2fbfc9dc9d84d24f4ebee68b (diff) | |
| parent | 6d0cd535d34ac10f144ab5d909256364363e7f38 (diff) | |
| download | kolla-25af34ce7423f7aee2f14d1c7a194642ed72a1c2.tar.gz kolla-25af34ce7423f7aee2f14d1c7a194642ed72a1c2.zip | |
Merge "Allow user to choose filesystem for osd"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-osd/extend_start.sh | 9 |
2 files changed, 10 insertions, 1 deletions
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 |