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 <<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"
+cat > /etc/sysconfig/docker-storage-setup <<EOF
+VG=docker
 EOF