summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-08-10 03:31:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-10 03:31:47 +0000
commit3fe9a4d9e91650e827807fdedf283128156db9f1 (patch)
treea2c43ccbc246199141c3d4d30ed332902917e5c1
parent5bd00249a7f38a15b88dffbfd1fd02d2b76004cc (diff)
parent44fc60cb9f0ddf643d0e53d8a0d3249a91c6970b (diff)
Merge "add support for AArch64 when porting MAAS"
-rwxr-xr-xci/03-maasdeploy.sh18
1 files changed, 14 insertions, 4 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 198d2484..60ed0855 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -13,11 +13,15 @@ fi
NODE_ARCTYPE=`arch`
NODE_ARC="amd64/generic"
+NODE_ARCHES="amd64"
if [ "x86_64" == "$NODE_ARCTYPE" ]; then
NODE_ARC="amd64/generic"
elif [ "ppc64le" == "$NODE_ARCTYPE" ]; then
NODE_ARC='ppc64el'
+elif [ "aarch64" == "$NODE_ARCTYPE" ]; then
+ NODE_ARC="arm64/generic"
+ NODE_ARCHES="arm64"
else
NODE_ARC=$NODE_ARCTYPE
fi
@@ -243,6 +247,10 @@ configuremaas(){
maas $PROFILE boot-source update $SOURCE_ID \
url=$URL keyring_filename=$KEYRING_FILE || true
+ if [ $NODE_ARCTYPE != "x86_64" ] ; then
+ maas $PROFILE boot-source-selection update 1 1 arches="$NODE_ARCHES"
+ fi
+
maas $PROFILE boot-resources import || true
while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ];
@@ -403,10 +411,10 @@ addnodes(){
echo_info "Creating and adding bootstrap node"
- virt-install --connect $VIRSHURL --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \
- cirrus --disk size=20,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \
+ virt-install --connect $VIRSHURL --name bootstrap --ram 4098 --cpu host --vcpus 2 \
+ --disk size=20,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \
$netw --boot network,hd,menu=off --noautoconsole \
- --vnc --print-xml | tee bootstrap
+ --print-xml | tee bootstrap
if [ "$virtinstall" -eq 1 ]; then
bootstrapmac=`grep "mac address" bootstrap | head -1 | cut -d '"' -f 2`
@@ -440,7 +448,7 @@ addnodes(){
virt-install --connect $VIRSHURL --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \
--disk size=120,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \
- $netw $netw --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee $NODE_NAME
+ $netw $netw --boot network,hd,menu=off --noautoconsole --print-xml | tee $NODE_NAME
nodemac=`grep "mac address" $NODE_NAME | head -1 | cut -d '"' -f 2`
virsh -c $VIRSHURL define --file $NODE_NAME
@@ -471,6 +479,8 @@ addnodes(){
NODE_ARC="amd64/generic"
elif [ "ppc64le" == "$NODE_ARCTYPE" ]; then
NODE_ARC='ppc64el'
+ elif [ "aarch64" == "$NODE_ARCTYPE" ]; then
+ NODE_ARC="arm64/generic"
else
NODE_ARC=$NODE_ARCTYPE
fi