summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbifrost/scripts/bifrost-provision.sh2
-rwxr-xr-xxci/config/aio-vars1
-rwxr-xr-xxci/config/ha-vars1
-rwxr-xr-xxci/config/mini-vars1
-rwxr-xr-xxci/config/noha-vars1
-rwxr-xr-xxci/scripts/vm/start-new-vm.sh4
6 files changed, 3 insertions, 7 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh
index 4de2ad2b..84c0db4a 100755
--- a/bifrost/scripts/bifrost-provision.sh
+++ b/bifrost/scripts/bifrost-provision.sh
@@ -46,7 +46,7 @@ export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
export VM_CPU=${VM_CPU:-4}
export VM_DISK=${VM_DISK:-100}
export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-8192}
-export VM_DISK_CACHE=${VM_DISK_CACHE:-none}
+export VM_DISK_CACHE=${VM_DISK_CACHE:-unsafe}
# Settings for bifrost
TEST_PLAYBOOK="opnfv-virtual.yaml"
diff --git a/xci/config/aio-vars b/xci/config/aio-vars
index e5a1aee9..1d2e4f96 100755
--- a/xci/config/aio-vars
+++ b/xci/config/aio-vars
@@ -15,4 +15,3 @@ export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
export VM_CPU=${VM_CPU:-8}
export VM_DISK=${VM_DISK:-80}
export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-8192}
-export VM_DISK_CACHE=none
diff --git a/xci/config/ha-vars b/xci/config/ha-vars
index 4c7cd872..32616ab3 100755
--- a/xci/config/ha-vars
+++ b/xci/config/ha-vars
@@ -15,4 +15,3 @@ export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
export VM_CPU=${VM_CPU:-6}
export VM_DISK=${VM_DISK:-80}
export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-16384}
-export VM_DISK_CACHE=none
diff --git a/xci/config/mini-vars b/xci/config/mini-vars
index 48b38ce8..142e8868 100755
--- a/xci/config/mini-vars
+++ b/xci/config/mini-vars
@@ -15,4 +15,3 @@ export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
export VM_CPU=${VM_CPU:-6}
export VM_DISK=${VM_DISK:-80}
export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-12288}
-export VM_DISK_CACHE=none
diff --git a/xci/config/noha-vars b/xci/config/noha-vars
index cb8901b8..4610b32a 100755
--- a/xci/config/noha-vars
+++ b/xci/config/noha-vars
@@ -15,4 +15,3 @@ export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
export VM_CPU=${VM_CPU:-6}
export VM_DISK=${VM_DISK:-80}
export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-12288}
-export VM_DISK_CACHE=none
diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh
index 70dc4efb..040377cd 100755
--- a/xci/scripts/vm/start-new-vm.sh
+++ b/xci/scripts/vm/start-new-vm.sh
@@ -208,12 +208,12 @@ if sudo vgscan | grep -q xci-vm-vg; then
}
echo "Flusing the ${OS_IMAGE_FILE} image to ${lv_dev}..."
sudo qemu-img convert -O raw ${OS_IMAGE_FILE} ${lv_dev}
- disk_config="${lv_dev},cache=directsync,bus=virtio"
+ disk_config="${lv_dev},cache=unsafe,io=threads,bus=virtio"
else
echo "Using file backend..."
echo "Resizing disk image '${OS}' to ${DISK}G..."
qemu-img resize ${OS_IMAGE_FILE} ${DISK}G
- disk_config="${OS_IMAGE_FILE},cache=none,bus=virtio"
+ disk_config="${OS_IMAGE_FILE},cache=unsafe,io=threads,bus=virtio"
fi
echo "Installing virtual machine '${VM_NAME}'..."