Merge pull request #19864 from owncloud/fix-objectstore-btrfs-host
skip btrfs hack for objectstore docker container on btrfs host
This commit is contained in:
commit
c530c9c322
|
@ -136,6 +136,8 @@ 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
|
||||||
|
# skip btrfs HACK if btrfs is already in place
|
||||||
|
if [ "$(stat -f /var/lib/ceph/osd/${CLUSTER}-0 2>/dev/null | grep btrfs | wc -l)" == "0" ]; then
|
||||||
# HACK create btrfs loopback device
|
# HACK create btrfs loopback device
|
||||||
echo "creating osd storage image"
|
echo "creating osd storage image"
|
||||||
dd if=/dev/zero of=/tmp/osddata bs=1M count=${OSD_SIZE}
|
dd if=/dev/zero of=/tmp/osddata bs=1M count=${OSD_SIZE}
|
||||||
|
@ -145,6 +147,7 @@ if [ ! -e /var/lib/ceph/osd/${CLUSTER}-0/keyring ]; then
|
||||||
echo "now mounted:"
|
echo "now mounted:"
|
||||||
mount
|
mount
|
||||||
# end HACK
|
# end HACK
|
||||||
|
fi
|
||||||
echo "creating osd"
|
echo "creating osd"
|
||||||
ceph osd create
|
ceph osd create
|
||||||
echo "creating osd filesystem"
|
echo "creating osd filesystem"
|
||||||
|
|
Loading…
Reference in New Issue