skip btrfs hack for objectstore docker container on btrfs host
This commit is contained in:
parent
008082ebad
commit
6d3a9bf03a
|
@ -136,15 +136,18 @@ ceph osd pool set rbd size 1
|
||||||
if [ ! -e /var/lib/ceph/osd/${CLUSTER}-0/keyring ]; then
|
if [ ! -e /var/lib/ceph/osd/${CLUSTER}-0/keyring ]; then
|
||||||
# bootstrap OSD
|
# bootstrap OSD
|
||||||
mkdir -p /var/lib/ceph/osd/${CLUSTER}-0
|
mkdir -p /var/lib/ceph/osd/${CLUSTER}-0
|
||||||
# HACK create btrfs loopback device
|
# skip btrfs HACK if btrfs is already in place
|
||||||
echo "creating osd storage image"
|
if [ "$(stat -f /var/lib/ceph/osd/${CLUSTER}-0 2>/dev/null | grep btrfs | wc -l)" == "0" ]; then
|
||||||
dd if=/dev/zero of=/tmp/osddata bs=1M count=${OSD_SIZE}
|
# HACK create btrfs loopback device
|
||||||
mkfs.btrfs /tmp/osddata
|
echo "creating osd storage image"
|
||||||
echo "mounting via loopback"
|
dd if=/dev/zero of=/tmp/osddata bs=1M count=${OSD_SIZE}
|
||||||
mount -o loop /tmp/osddata /var/lib/ceph/osd/${CLUSTER}-0
|
mkfs.btrfs /tmp/osddata
|
||||||
echo "now mounted:"
|
echo "mounting via loopback"
|
||||||
mount
|
mount -o loop /tmp/osddata /var/lib/ceph/osd/${CLUSTER}-0
|
||||||
# end HACK
|
echo "now mounted:"
|
||||||
|
mount
|
||||||
|
# end HACK
|
||||||
|
fi
|
||||||
echo "creating osd"
|
echo "creating osd"
|
||||||
ceph osd create
|
ceph osd create
|
||||||
echo "creating osd filesystem"
|
echo "creating osd filesystem"
|
||||||
|
@ -268,4 +271,4 @@ fi
|
||||||
#########
|
#########
|
||||||
|
|
||||||
echo "watching ceph"
|
echo "watching ceph"
|
||||||
exec ceph -w
|
exec ceph -w
|
||||||
|
|
Loading…
Reference in New Issue