Check that nodes have not failed commissioning or testing

[joid.git] / ci / 03-maasdeploy.sh

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index 1387e6b..1e93627 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -345,10 +345,12 @@ addnodes(){
     # if we have a virshurl configuration we use it, else we use local
     VIRSHURL=$(cat labconfig.json | jq -r '.opnfv.virshurl')
     if ([ $VIRSHURL == "" ] || [ "$VIRSHURL" == "null" ]); then
-        VIRSHURL="qemu+ssh://$USER@$MAAS_IP/system "
+        VIRSHIP=$MAAS_IP
+        VIRSHURL="qemu+ssh://$USER@$VIRSHIP/system "
         VIRSHHOST=""
     else
         VIRSHHOST=$(echo $VIRSHURL| cut -d\/ -f 3 | cut -d@ -f2)
+        VIRSHIP=""  # TODO: parse from $VIRSHURL if needed
     fi
 
     if [ "$virtinstall" -eq 1 ]; then
@@ -374,6 +376,16 @@ addnodes(){
         done
     fi
 
+    # Add server fingerprint to known hosts to prevent security prompt in the
+    # SSH connection during the virt-install
+    if [ $VIRSHIP != "" ]; then
+        # Check if the IP is not already present among the known hosts
+        if ! ssh-keygen -F $VIRSHIP > /dev/null ; then
+            echo "SSH fingerprint of the host is not known yet, adding"
+            ssh-keyscan -H $VIRSHIP >> ~/.ssh/known_hosts
+        fi
+    fi
+
     virt-install --connect $VIRSHURL --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \
                  cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,cache=directsync,io=native,pool=default \
                  $netw --boot network,hd,menu=off --noautoconsole \
@@ -431,6 +443,7 @@ addnodes(){
            units=$(($units - 1));
            NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 `
            MAC_ADDRESS=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"admin\").mac"[0] | cut -d \" -f 2 `
+           MAC_ADDRESS1=`cat labconfig.json | jq ".lab.racks[].nodes[$units].nics[] | select(.spaces[]==\"floating\").mac"[0] | cut -d \" -f 2 `
            POWER_TYPE=`cat labconfig.json | jq ".lab.racks[].nodes[$units].power.type" | cut -d \" -f 2 `
            POWER_IP=`cat labconfig.json |  jq ".lab.racks[].nodes[$units].power.address" | cut -d \" -f 2 `
            POWER_USER=`cat labconfig.json |  jq ".lab.racks[].nodes[$units].power.user" | cut -d \" -f 2 `
@@ -439,16 +452,24 @@ addnodes(){
            maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
                hostname=$NODE_NAME power_type=$POWER_TYPE power_parameters_power_address=$POWER_IP \
                power_parameters_power_user=$POWER_USER power_parameters_power_pass=$POWER_PASS mac_addresses=$MAC_ADDRESS \
-               architecture='amd64/generic'
+               mac_addresses=$MAC_ADDRESS1 architecture='amd64/generic'
        done
     fi
 
     maas $PROFILE pods create type=virsh power_address="$VIRSHURL" power_user=$USER
 
-    # make sure nodes are added into MAAS and none of them is in commisoning state
-    while [ "$(maas $PROFILE nodes read | grep  Commissioning )" ];
+    # Make sure nodes are added into MAAS and none of them is in commissioning state
+    while [ "$(maas $PROFILE nodes read | grep Commissioning )" ];
     do
         sleep 60
+
+        # Make sure that no nodes have failed commissioning or testing
+        if [ "$(maas $PROFILE nodes read | grep 'Failed' )" ];
+        then
+            echo "Error: Some nodes have failed commissioning or testing" 1>&2
+            exit 1
+        fi
+
     done
 
 }
@@ -467,7 +488,7 @@ setupspacenetwork
 sudo ./maas-reconfigure-region.sh $MAAS_IP
 sleep 120
 
-#lets add the nodes now. Currently works only for virtual deploymnet.
+# Let's add the nodes now. Currently works only for virtual deployment.
 addnodes
 
 echo "... Deployment of maas finish ...."