diff options
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 2 | ||||
| -rwxr-xr-x | xci/config/aio-vars | 2 | ||||
| -rwxr-xr-x | xci/config/ha-vars | 2 | ||||
| -rwxr-xr-x | xci/config/mini-vars | 2 | ||||
| -rwxr-xr-x | xci/config/noha-vars | 2 | ||||
| -rwxr-xr-x | xci/scripts/vm/start-new-vm.sh | 4 |
6 files changed, 7 insertions, 7 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index ec46b1ef..2e887670 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -41,7 +41,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:-unsafe} +export VM_DISK_CACHE=${VM_DISK_CACHE:-none} # Settings for bifrost TEST_PLAYBOOK="opnfv-virtual.yaml" diff --git a/xci/config/aio-vars b/xci/config/aio-vars index ed921f42..e5a1aee9 100755 --- a/xci/config/aio-vars +++ b/xci/config/aio-vars @@ -15,4 +15,4 @@ 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=unsafe +export VM_DISK_CACHE=none diff --git a/xci/config/ha-vars b/xci/config/ha-vars index 2a9409fa..4c7cd872 100755 --- a/xci/config/ha-vars +++ b/xci/config/ha-vars @@ -15,4 +15,4 @@ 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=unsafe +export VM_DISK_CACHE=none diff --git a/xci/config/mini-vars b/xci/config/mini-vars index 2367a3b5..48b38ce8 100755 --- a/xci/config/mini-vars +++ b/xci/config/mini-vars @@ -15,4 +15,4 @@ 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=unsafe +export VM_DISK_CACHE=none diff --git a/xci/config/noha-vars b/xci/config/noha-vars index 185d9d63..cb8901b8 100755 --- a/xci/config/noha-vars +++ b/xci/config/noha-vars @@ -15,4 +15,4 @@ 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=unsafe +export VM_DISK_CACHE=none diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh index d451daae..0af2a359 100755 --- a/xci/scripts/vm/start-new-vm.sh +++ b/xci/scripts/vm/start-new-vm.sh @@ -85,7 +85,7 @@ update_clean_vm_files() { declare -r CPU=${XCI_CPU_TYPE:-host-passthrough} declare -r NCPUS=${XCI_NCPUS:-24} -declare -r MEMORY=${XCI_MEMORY_SIZE:-49152} +declare -r MEMORY=${XCI_MEMORY_SIZE:-65536} declare -r DISK=${XCI_DISK_SIZE:-500} declare -r VM_NAME=${1}_xci_vm declare -r OS=${1} @@ -208,7 +208,7 @@ sudo virsh net-list --inactive | grep -q ${NETWORK} && sudo virsh net-start ${NE echo "Installing virtual machine '${VM_NAME}'..." sudo virt-install -n ${VM_NAME} --memory ${MEMORY} --vcpus ${NCPUS} --cpu ${CPU} \ - --import --disk=${OS_IMAGE_FILE},cache=unsafe,bus=virtio --network network=${NETWORK},model=virtio \ + --import --disk=${OS_IMAGE_FILE},cache=none,bus=virtio --network network=${NETWORK},model=virtio \ --graphics none --hvm --noautoconsole trap destroy_vm_on_failures EXIT |