commit 8c93374cddda59129ac809f159cb554f54c7443c
author Zuul <zuul@review.openstack.org> Mon Dec 17 06:46:48 2018 +0000
committer Gerrit Code Review <review@openstack.org> Mon Dec 17 06:46:48 2018 +0000
tree f64d2512459018246f84ecdb99e487107ca23aa4
parent e812d284b8970d0242f35b3d15b923d246fa7308
parent 584979ce2eeb0c2e590a996657e601bfd5543eee

Merge "docs: cleanup install docs"

lib/lvm

diff --git a/lib/lvm b/lib/lvm
index f047181..d9e78a0 100644
--- a/lib/lvm
+++ b/lib/lvm
@@ -99,8 +99,15 @@
     if ! sudo vgs $vg; then
         # Only create if the file doesn't already exists
         [[ -f $backing_file ]] || truncate -s $size $backing_file
+
+        local directio=""
+        # Check to see if we can do direct-io
+        if losetup -h | grep -q direct-io; then
+            directio="--direct-io=on"
+        fi
+
         local vg_dev
-        vg_dev=`sudo losetup -f --show $backing_file`
+        vg_dev=$(sudo losetup -f --show $directio $backing_file)
 
         # Only create volume group if it doesn't already exist
         if ! sudo vgs $vg; then

stackrc

diff --git a/stackrc b/stackrc
index 170d3b6..8463313 100644
--- a/stackrc
+++ b/stackrc
@@ -685,7 +685,7 @@
 #IMAGE_URLS="http://smoser.brickies.net/ubuntu/ttylinux-uec/ttylinux-uec-amd64-11.2_2.6.35-15_1.tar.gz" # old ttylinux-uec image
 #IMAGE_URLS="http://download.cirros-cloud.net/${CIRROS_VERSION}/cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img" # cirros full disk image
 
-CIRROS_VERSION=${CIRROS_VERSION:-"0.3.5"}
+CIRROS_VERSION=${CIRROS_VERSION:-"0.3.6"}
 CIRROS_ARCH=${CIRROS_ARCH:-"x86_64"}
 
 # Set default image based on ``VIRT_DRIVER`` and ``LIBVIRT_TYPE``, either of