diff options
| author |   Markos Chandras <mchandras@suse.de> | 2018-02-26 09:41:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-26 09:41:40 +0000 |
| commit | 03f3dc9a997c5ac7041631de013aeeaebd43faa0 (patch) | |
| tree | 44c83ff8ee56b7957a51e0c26a8d5d2dabe9387d | |
| parent | c5c2f187ff01384e8b9ef323fb5602dcb7154d15 (diff) | |
| parent | 13f9ec07a26835064027817ff2a6f16cb7120cde (diff) | |
Merge "xci: Switch default CPU model to 'host-model'"
| -rwxr-xr-x | bifrost/scripts/bifrost-provision.sh | 4 | ||||
| -rwxr-xr-x | xci/scripts/vm/start-new-vm.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh index 84c0db4a..d641d506 100755 --- a/bifrost/scripts/bifrost-provision.sh +++ b/bifrost/scripts/bifrost-provision.sh @@ -107,7 +107,7 @@ ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ -i inventory/localhost \ test-bifrost-create-vm.yaml \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ - -e test_vm_cpu='host-passthrough' \ + -e test_vm_cpu='host-model' \ -e test_vm_memory_size=${VM_MEMORY_SIZE} \ -e enable_venv=${ENABLE_VENV} \ -e test_vm_domain_type=${VM_DOMAIN_TYPE} \ @@ -120,7 +120,7 @@ ${ANSIBLE} ${XCI_ANSIBLE_VERBOSITY} \ -e use_cirros=${USE_CIRROS} \ -e testing_user=${TESTING_USER} \ -e test_vm_num_nodes=${TEST_VM_NUM_NODES} \ - -e test_vm_cpu='host-passthrough' \ + -e test_vm_cpu='host-model' \ -e inventory_dhcp=${INVENTORY_DHCP} \ -e inventory_dhcp_static_ip=${INVENTORY_DHCP_STATIC_IP} \ -e enable_venv=${ENABLE_VENV} \ diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh index 915a7ee2..0cafaf2b 100755 --- a/xci/scripts/vm/start-new-vm.sh +++ b/xci/scripts/vm/start-new-vm.sh @@ -83,7 +83,7 @@ update_clean_vm_files() { [[ $# -ne 1 ]] && usage && exit 1 -declare -r CPU=${XCI_CPU_TYPE:-host-passthrough} +declare -r CPU=${XCI_CPU_TYPE:-host-model} declare -r NCPUS=${XCI_NCPUS:-24} declare -r MEMORY=${XCI_MEMORY_SIZE:-65536} declare -r DISK=${XCI_DISK_SIZE:-500} |