From 40b8a0243e20d551f2e153759f531749783656be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 11 Dec 2015 11:11:05 +0900
Subject: [PATCH] Skip gate FS optimization if no secondary disk

This commit removes the assumption that all gate nodes have a secondary
disk, and skip tuning the filesystem if the node doesn't have one.

This fixes gate failures on OVH nodes.

Closes-Bug: #1525047

Change-Id: Ief22f34b32caf7a8b446df888fc5cc1964ad272e
---
 tests/setup_Debian.sh | 37 ++++++++++++++++++++-----------------
 tests/setup_RedHat.sh | 34 +++++++++++++++++++---------------
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/tests/setup_Debian.sh b/tests/setup_Debian.sh
index c9159e0033..e2a4c939b1 100755
--- a/tests/setup_Debian.sh
+++ b/tests/setup_Debian.sh
@@ -14,25 +14,28 @@ sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58
 sudo apt-get update
 sudo apt-get install -y --no-install-recommends docker-engine=1.8.2-0~trusty btrfs-tools
 
-# The reason for using BTRFS is stability. There are numerous issues with the
-# devicemapper backed on Ubuntu and AUFS is slow. BTRFS is very solid as a
-# backend in my experince. I use ie almost exclusively.
-# Format Disks and setup Docker to use BTRFS
-sudo umount /dev/${DEV} || true
-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/*
+# Only do FS optimization if we have a secondary disk
+if [[ -b /dev/${DEV} ]]; then
+    # The reason for using BTRFS is stability. There are numerous issues with the
+    # devicemapper backed on Ubuntu and AUFS is slow. BTRFS is very solid as a
+    # backend in my experince. I use ie almost exclusively.
+    # Format Disks and setup Docker to use BTRFS
+    sudo umount /dev/${DEV} || true
+    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
+    # 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 service docker start
+fi
 
 sudo docker info
 
diff --git a/tests/setup_RedHat.sh b/tests/setup_RedHat.sh
index e9920a0da4..e6b82da820 100755
--- a/tests/setup_RedHat.sh
+++ b/tests/setup_RedHat.sh
@@ -19,22 +19,26 @@ EOF
 
 sudo yum install -y libffi-devel openssl-devel docker-engine-1.8.2 xfsprogs
 
-# Setup backing disk for use with Docker. This is to ensure we use the ephemeral
-# disk provided to the build instance. It ensures the correct disk and storage
-# driver are used for Docker. It is recommend to use the thin provisioning
-# driver. https://github.com/docker/docker/blob/master/man/docker.1.md
-sudo parted /dev/${DEV} -s -- mklabel msdos mkpart pri 1 -1
-# Figure out the path to the partitioned device
-PARTDEV=$(ls "/dev/${DEV}"* | egrep "/dev/${DEV}p?1")
-sudo pvcreate ${PARTDEV}
-sudo vgcreate kolla01 ${PARTDEV}
-sudo lvcreate -n thin01 -L 60G kolla01
-sudo lvcreate -n thin01meta -L 2G kolla01
-yes | sudo lvconvert --type thin-pool --poolmetadata kolla01/thin01meta kolla01/thin01
+# Only do FS optimization if we have a secondary disk
+if [[ -b /dev/${DEV} ]]; then
+    # Setup backing disk for use with Docker. This is to ensure we use the ephemeral
+    # disk provided to the build instance. It ensures the correct disk and storage
+    # driver are used for Docker. It is recommend to use the thin provisioning
+    # driver. https://github.com/docker/docker/blob/master/man/docker.1.md
+    sudo parted /dev/${DEV} -s -- mklabel msdos mkpart pri 1 -1
+    # Figure out the path to the partitioned device
+    PARTDEV=$(ls "/dev/${DEV}"* | egrep "/dev/${DEV}p?1")
+    sudo pvcreate ${PARTDEV}
+    sudo vgcreate kolla01 ${PARTDEV}
+    sudo lvcreate -n thin01 -L 60G kolla01
+    sudo lvcreate -n thin01meta -L 2G kolla01
+    yes | sudo lvconvert --type thin-pool --poolmetadata kolla01/thin01meta kolla01/thin01
+
+    # Setup Docker
+    sudo sed -i -r 's,(ExecStart)=(.+),\1=/usr/bin/docker daemon --storage-driver devicemapper --storage-opt dm.fs=xfs --storage-opt dm.thinpooldev=kolla01-thin01 --storage-opt dm.use_deferred_removal=true,' /usr/lib/systemd/system/docker.service
+    sudo systemctl daemon-reload
+fi
 
-# Setup Docker
-sudo sed -i -r 's,(ExecStart)=(.+),\1=/usr/bin/docker daemon --storage-driver devicemapper --storage-opt dm.fs=xfs --storage-opt dm.thinpooldev=kolla01-thin01 --storage-opt dm.use_deferred_removal=true,' /usr/lib/systemd/system/docker.service
-sudo systemctl daemon-reload
 sudo systemctl start docker
 sudo docker info