aboutsummaryrefslogtreecommitdiff
path: root/tests/setup_RedHat.sh
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-14 09:42:33 +0000
committerGerrit Code Review <review@openstack.org>2015-12-14 09:42:33 +0000
commit987ae1af770aed397af89d38757ba60a97f3b3d2 (patch)
treeb1bedbb75f66e66a25d6ed1dd2ffffae46e652b8 /tests/setup_RedHat.sh
parentde7293833eddc7cb6f1ae88023f073e93bd45f08 (diff)
parent40b8a0243e20d551f2e153759f531749783656be (diff)
downloadkolla-987ae1af770aed397af89d38757ba60a97f3b3d2.tar.gz
kolla-987ae1af770aed397af89d38757ba60a97f3b3d2.zip
Merge "Skip gate FS optimization if no secondary disk"
Diffstat (limited to 'tests/setup_RedHat.sh')
-rwxr-xr-xtests/setup_RedHat.sh36
1 files changed, 20 insertions, 16 deletions
diff --git a/tests/setup_RedHat.sh b/tests/setup_RedHat.sh
index e9920a0da..e6b82da82 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
-
-# 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
+# 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
+
sudo systemctl start docker
sudo docker info