From ce2d9384047ae5daf7c361fe79ee2923f4619e57 Mon Sep 17 00:00:00 2001 From: Tom Cammann Date: Sun, 24 May 2015 02:28:32 -0700 Subject: [PATCH] Backport "configure docker storage correctly" The changes made by the configure-docker-storage.sh fragment were being overwritten by the docker-storage-setup script that atomic runs at boot. This patch updates configure-docker-storage.sh such that it will generate configuration for docker-storage-setup, which will in turn generate the correct /etc/sysconfig/docker-storage. heat-coe-templates: Ib86b0238b7b82bd28343ddfd385c31a73dc5af19 Change-Id: I48722dbb0ba2ddd6a5d7c04c9623020f7bb0e537 --- .../fragments/configure-docker-storage.sh | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh b/magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh index 94061b9a76..8233840687 100644 --- a/magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh +++ b/magnum/templates/heat-kubernetes/fragments/configure-docker-storage.sh @@ -4,30 +4,23 @@ DOCKER_DEV=/dev/disk/by-id/virtio-${DOCKER_VOLUME:0:20} -# Wait until docker volume is hot-plugged -attempts=1200 -while [ ! -b $DOCKER_DEV ] -do - sleep 0.25 - # Trigger udev to make sure symlinks are up to date - udevadm trigger - attempts=$(($attempts - 1)) - if [[ $attempts -eq 0 ]]; then - break - fi +attempts=60 +while [[ ! -b $DOCKER_DEV && $attempts != 0 ]]; do + echo "waiting for disk $DOCKER_DEV" + sleep 0.5 + udevadm trigger + let attempts-- done if ! [ -b $DOCKER_DEV ]; then - echo "ERROR: device $DOCKER_DEV does not exist" >&2 - exit 1 + echo "ERROR: device $DOCKER_DEV does not exist" >&2 + exit 1 fi pvcreate $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 < /etc/sysconfig/docker-storage-setup <