openstack
/
magnum
Code Issues Proposed changes

Merge "Backport "configure docker storage correctly""

This commit is contained in:
Jenkins 2015-07-01 01:13:40 +00:00 committed by Gerrit Code Review
parent da9d3d82e5 ce2d938404
commit 3c20cc5ae9
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh
View File

@ -4,30 +4,23 @@
DOCKER_DEV=/dev/disk/by-id/virtio-${DOCKER_VOLUME:0:20} DOCKER_DEV=/dev/disk/by-id/virtio-${DOCKER_VOLUME:0:20}
# Wait until docker volume is hot-plugged attempts=60
attempts=1200 while [[ ! -b $DOCKER_DEV && $attempts != 0 ]]; do
while [ ! -b $DOCKER_DEV ] echo "waiting for disk $DOCKER_DEV"
do sleep 0.5
sleep 0.25 udevadm trigger
# Trigger udev to make sure symlinks are up to date let attempts--
udevadm trigger
attempts=$(($attempts - 1))
if [[ $attempts -eq 0 ]]; then
break
fi
done done
if ! [ -b $DOCKER_DEV ]; then if ! [ -b $DOCKER_DEV ]; then
echo "ERROR: device $DOCKER_DEV does not exist" >&2 echo "ERROR: device $DOCKER_DEV does not exist" >&2
exit 1 exit 1
fi fi
pvcreate $DOCKER_DEV pvcreate $DOCKER_DEV
vgcreate docker $DOCKER_DEV vgcreate docker $DOCKER_DEV
lvcreate --wipesignatures y -n data docker -l 95%VG
lvcreate --wipesignatures y -n metadata docker -l 5%VG
cat > /etc/sysconfig/docker-storage <<EOF cat > /etc/sysconfig/docker-storage-setup <<EOF
DOCKER_STORAGE_OPTIONS="--storage-opt dm.blkdiscard=false --storage-opt dm.metadatadev=/dev/docker/metadata --storage-opt dm.datadev=/dev/docker/data --storage-opt dm.fs=xfs" VG=docker
EOF EOF