From: Markos Chandras <mchandras@suse.de>
Date: Fri, 23 Feb 2018 08:50:03 +0000 (+0000)
Subject: xci: Switch default CPU model to 'host-model'
X-Git-Tag: 6.0.0~153^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F52507%2F1;p=releng-xci.git

xci: Switch default CPU model to 'host-model'

From upstream docs:

'The host-model mode is essentially a shortcut to copying host CPU
definition from capabilities XML into domain XML. Since the CPU
definition is copied just before starting a domain, exactly the
same XML can be used on different hosts while still providing
the best guest CPU each host supports'

It's probably safer to use that instead of 'host-passthrough' so
we can get a CPU (both for main VM and the nested ones) that libvirt
understands. Moreover, it's important to present a CPU that the
guest OS understands as well.

Change-Id: I25a8ff0e8635df9804c793d184f048cc86059ce0
Signed-off-by: Markos Chandras <mchandras@suse.de>
---

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 f3ddcc07..02c14b5c 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}