diff options
| author |   Di Xu <di.xu@arm.com> | 2017-08-16 12:55:24 +0800 |
|---|---|---|
| committer | Di Xu <di.xu@arm.com> | 2017-08-16 13:33:18 +0800 |
| commit | 0fdc56cdcee5efd2470e7409c76e6a3a4a6349cd (patch) | |
| tree | cd1dcb5367115876957d1995f3e688fe523c7855 /ci | |
| parent | dce9b446825d4d90f145424a9d7079ba8f3b649b (diff) | |
fix cpu model for aarch64 kvm
CPU mode 'host-model' for aarch64 kvm domain is not supported by hypervisor
refer to issue #1673467 (https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/1673467)
Change-Id: Idad0a4a19a801200b5f87d43e2a62b21833ab6b1
Signed-off-by: Di Xu <di.xu@arm.com>
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/03-maasdeploy.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index a162bfb9..dcf4b46b 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -12,11 +12,13 @@ if [ ! -e $HOME/.ssh/id_rsa ]; then fi NODE_ARCTYPE=`arch` +CPU_MODEL="host" if [ "ppc64le" == "$NODE_ARCTYPE" ]; then NODE_ARCHES="ppc64el" elif [ "aarch64" == "$NODE_ARCTYPE" ]; then NODE_ARCHES="arm64" + CPU_MODEL="host-passthrough" else NODE_ARCHES="amd64" fi @@ -430,7 +432,7 @@ addnodes(){ echo_info "Creating and adding bootstrap node" - virt-install --connect $VIRSHURL --name bootstrap --ram 4098 --cpu host --vcpus 2 \ + virt-install --connect $VIRSHURL --name bootstrap --ram 4098 --cpu $CPU_MODEL --vcpus 2 \ --disk size=20,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \ $netw --boot network,hd,menu=off --noautoconsole \ --print-xml | tee bootstrap @@ -465,7 +467,7 @@ addnodes(){ units=$(($units - 1)); NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 ` - virt-install --connect $VIRSHURL --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \ + virt-install --connect $VIRSHURL --name $NODE_NAME --ram 8192 --cpu $CPU_MODEL --vcpus 4 \ --disk size=120,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \ $netw $netw --boot network,hd,menu=off --noautoconsole --print-xml | tee $NODE_NAME |