diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-08-17 14:08:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-17 14:08:47 +0000 |
| commit | 1ed595dd652e94e50b248e7416096b1caf4d76cc (patch) | |
| tree | c8997d1411b4ee56845207124a2010bbc9fb7858 | |
| parent | 3c848787b3c8f2bdbf7723a5178b688e018f1e95 (diff) | |
| parent | 0fdc56cdcee5efd2470e7409c76e6a3a4a6349cd (diff) | |
Merge "fix cpu model for aarch64 kvm"
| -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 a13549c8..d74214bf 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 @@ -429,7 +431,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 @@ -464,7 +466,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 |