sudo apt-add-repository ppa:maas/stable -y
fi
if [ "bionic" != "$opnfvdistro" ]; then
- sudo apt-add-repository cloud-archive:pike -y
+ sudo apt-add-repository cloud-archive:queens -y
if [ "aarch64" == "$NODE_ARCTYPE" ]; then
- sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y
+ sudo add-apt-repository ppa:ubuntu-cloud-archive/queens-staging -y
fi
fi
sudo virsh pool-start default || true
sudo virsh pool-autostart default || true
-# In case of virtual install set network
-if [ "$virtinstall" -eq 1 ]; then
- sudo virsh net-dumpxml default > default-net-org.xml
- sed -i '/dhcp/d' default-net-org.xml
- sed -i '/range/d' default-net-org.xml
- sudo virsh net-destroy default
- sudo virsh net-define default-net-org.xml
- sudo virsh net-start default
- rm -f default-net-org.xml
-fi
+# As we use kvm so setup network on admin network
+ADMIN_BR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.bridge | cut -d \" -f 2 `
+sed -i "s@brAdm@$ADMIN_BR@" net.xml
+sudo virsh net-destroy default || true
+sudo virsh net-undefine default || true
+sudo virsh net-define net.xml || true
+sudo virsh net-start default || true
#
# Cleanup, juju init and config backup
VIRSHIP="" # TODO: parse from $VIRSHURL if needed
fi
- if [ "$virtinstall" -eq 1 ]; then
- netw=" --network bridge=virbr0,model=virtio"
- elif ([ "$VIRSHHOST" != "" ]); then
+ if ([ "$VIRSHHOST" != "" ]); then
# Get the bridge hosting the remote virsh
brid=$(ssh $VIRSHHOST "ip a l | grep $VIRSHHOST | perl -pe 's/.* (.*)\$/\$1/g'")
netw=" --network bridge=$brid,model=virtio"
else
netw=""
- brid=`brctl show | grep 8000 | cut -d "8" -f 1 | tr "\n" " " | tr " " " " | tr -s " "`
+ brid=`sudo brctl show | grep 8000 | cut -d "8" -f 1 | tr "\n" " " | tr " " " " | tr -s " "`
ADMIN_BR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.bridge | cut -d \" -f 2 `
for feature in $brid; do
done
fi
- maas $PROFILE pods create type=virsh power_address="$VIRSHURL" power_user=$USER
+ # Iterate to avoid "Conflict error" issue
+ for ii in 1 2 3 4 5 6 7 8 9 10
+ do
+ echo "Try $ii"
+ maas $PROFILE pods create type=virsh power_address="$VIRSHURL" power_user=$USER > /tmp/deploy.out 2>&1 || true
+ cat /tmp/deploy.out
+ if ! fgrep -q 'Conflict' /tmp/deploy.out
+ then
+ break
+ else
+ continue
+ fi
+ done
+
# Make sure nodes are added into MAAS and none of them is in commissioning state
i=0