aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-11-05 09:49:12 +0000
committerGerrit Code Review <review@openstack.org>2015-11-05 09:49:12 +0000
commit4beea51e75c1a3c8348f58101ea62528187b597b (patch)
treeed7d55d71761bdd92d147a43f43bfbfb0e39dc20
parent0ee4b57e444ff624c056356e57c425376114e90c (diff)
parente65392aefb8278a5e8e7e1270891bc7d8769b205 (diff)
downloadkolla-4beea51e75c1a3c8348f58101ea62528187b597b.tar.gz
kolla-4beea51e75c1a3c8348f58101ea62528187b597b.zip
Merge "Adjust gate btrfs setup"
-rwxr-xr-xtests/setup_ubuntu.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/setup_ubuntu.sh b/tests/setup_ubuntu.sh
index 4eb30bc8b..66280da34 100755
--- a/tests/setup_ubuntu.sh
+++ b/tests/setup_ubuntu.sh
@@ -20,8 +20,15 @@ sudo parted /dev/${DEV} -s -- mklabel msdos
sudo service docker stop
echo 'DOCKER_OPTS="-s btrfs"' | sudo tee /etc/default/docker
sudo rm -rf /var/lib/docker/*
+
+# We want to snapshot the entire docker directory so we have to first create a
+# subvolume and use that as the root for the docker directory.
sudo mkfs.btrfs -f /dev/${DEV}
sudo mount /dev/${DEV} /var/lib/docker
+sudo btrfs subvolume create /var/lib/docker/docker
+sudo umount /var/lib/docker
+sudo mount -o noatime,compress=lzo,space_cache,subvol=docker /dev/${DEV} /var/lib/docker
+
sudo service docker start
sudo docker info