modfied to support intel lab.

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

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index cef24e7..c66bf16 100755 (executable)
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -83,7 +83,7 @@ PROFILE=ubuntu
 MY_UPSTREAM_DNS=`grep "upstream_dns" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
 SSH_KEY=`cat ~/.ssh/id_rsa.pub`
 MAIN_ARCHIVE=`grep "main_archive" deployconfig.yaml | cut -d ':' -f 2-3 | sed -e 's/ //'`
-URL=https://images.maas.io/ephemeral-v2/daily/
+URL=https://images.maas.io/ephemeral-v3/daily/
 KEYRING_FILE=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
 SOURCE_ID=1
 FABRIC_ID=1
@@ -190,7 +190,7 @@ installmaas(){
 configuremaas(){
     #reconfigure maas with correct MAAS address.
     #Below code is needed as MAAS have issue in commisoning without restart.
-    sudo ./maas-reconfigure-region.sh $MAAS_IP
+    #sudo ./maas-reconfigure-region.sh $MAAS_IP
     sleep 30
     sudo maas-rack config --region-url http://$MAAS_IP:5240/MAAS
 
@@ -218,10 +218,10 @@ configuremaas(){
         maas $PROFILE spaces create name=$space || true
     done
 
-    #maas $PROFILE boot-source update $SOURCE_ID \
-    #     url=$URL keyring_filename=$KEYRING_FILE || true
+    maas $PROFILE boot-source update $SOURCE_ID \
+         url=$URL keyring_filename=$KEYRING_FILE || true
+
     maas $PROFILE boot-resources import || true
-    sleep 10
 
     while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ];
     do
@@ -240,7 +240,7 @@ setupspacenetwork(){
         SPACE_VLAN=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="'$type'")'.vlan | cut -d \" -f 2 `
         SPACE_GWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="'$type'")'.gateway | cut -d \" -f 2 `
         NET_FABRIC_NAME=$(maas $PROFILE subnets read | jq -r ".[] |  select(.cidr==\"$SPACE_CIDR\")".vlan.fabric)
-        if ([ $NET_FABRIC_NAME ]); then
+        if ([ $NET_FABRIC_NAME ] && [ $NET_FABRIC_NAME != "null" ]); then
             NET_FABRIC_VID=$(maas $PROFILE subnets read | jq -r ".[] |  select(.cidr==\"$SPACE_CIDR\")".vlan.vid)
             NET_FABRIC_ID=$(maas $PROFILE fabric read $NET_FABRIC_NAME | jq -r ".id")
             if ([ $SPACE_VLAN == "null" ]); then
@@ -282,6 +282,7 @@ setupspacenetwork(){
                         maas $PROFILE subnets create fabric=$FABRIC_ID cidr=$SPACE_CIDR vid="0"
                     fi
                 fi
+                NET_FABRIC_NAME=$(maas $PROFILE subnets read | jq -r ".[] |  select(.cidr==\"$SPACE_CIDR\")".vlan.fabric)
             fi
         fi
         case "$type" in
@@ -294,8 +295,8 @@ setupspacenetwork(){
             *)                 JUJU_SPACE='default';       DHCP='OFF'; echo "      >>> Unknown SPACE" ;;
         esac
         JUJU_SPACE_ID=$(maas $PROFILE spaces read | jq -r ".[] |  select(.name==\"$JUJU_SPACE\")".id)
-        if ([ $JUJU_SPACE ] && [ $JUJU_SPACE != "null" ]); then
-            maas $PROFILE subnet update $SUBNET_CIDR space=$JUJU_SPACE_ID
+        if ([ $NET_FABRIC_NAME ] && [ $NET_FABRIC_NAME != "null" ]); then 
+            maas $PROFILE subnet update $SPACE_CIDR space=$JUJU_SPACE_ID
         fi
         if ([ $type == "admin" ]); then
                     # If we have a network, we create it
@@ -333,7 +334,7 @@ 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:///system "
+        VIRSHURL="qemu+ssh://$USER@$MAAS_IP/system "
         VIRSHHOST=""
     else
         VIRSHHOST=$(echo $VIRSHURL| cut -d\/ -f 3 | cut -d@ -f2)
@@ -383,7 +384,7 @@ addnodes(){
 
     maas $PROFILE machines create autodetect_nodegroup='yes' name='bootstrap' \
         tags='bootstrap' hostname='bootstrap' power_type='virsh' mac_addresses=$bootstrapmac \
-        power_parameters_power_address=$VIRSHURL \
+        power_parameters_power_address="$VIRSHURL" \
         architecture='amd64/generic' power_parameters_power_id='bootstrap'
 
     bootstrapid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "bootstrap").system_id')
@@ -397,16 +398,16 @@ addnodes(){
            units=$(($units - 1));
            NODE_NAME=`cat labconfig.json | jq ".lab.racks[].nodes[$units].name" | cut -d \" -f 2 `
 
-            sudo virt-install --connect qemu:///system --name $NODE_NAME --ram 8192 --cpu host --vcpus 4 \
+            sudo 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
 
             nodemac=`grep  "mac address" $NODE_NAME | head -1 | cut -d '"' -f 2`
-            sudo virsh -c qemu:///system define --file $NODE_NAME
+            sudo virsh -c $VIRSHURL --file $NODE_NAME
             rm -f $NODE_NAME
             maas $PROFILE machines create autodetect_nodegroup='yes' name=$NODE_NAME \
                 tags='control compute' hostname=$NODE_NAME power_type='virsh' mac_addresses=$nodemac \
-                power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
+                power_parameters_power_address="$VIRSHURL" \
                 architecture='amd64/generic' power_parameters_power_id=$NODE_NAME
             nodeid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == '\"$NODE_NAME\"').system_id')
             maas $PROFILE tag update-nodes control add=$nodeid || true
@@ -447,17 +448,10 @@ sleep 30
 # third parameter will define the space. It is required to have admin
 
 setupspacenetwork
-#setopnfvspaces
-#getfabrichostingnet $SUBNET_CIDR
-#ADMIN_FABRIC_ID=$NET_FABRIC_ID
-#ADMIN_FABRIC_NAME=$NET_FABRIC_NAME
-#deleteexistingnetw
-#sleep 30
-#setopnfvfabrics
-#deleteunusednetw
 
 #just make sure rack controller has been synced and import only
 # just whether images have been imported or not.
+sudo ./maas-reconfigure-region.sh $MAAS_IP
 sleep 120
 
 #lets add the nodes now. Currently works only for virtual deploymnet.
@@ -517,11 +511,12 @@ if [ -e ./labconfig.json ]; then
         for IF_NAME in $IF_LIST; do
             # get the space of the interface
             IF_SPACE=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] | select(.ifname==\"$IF_NAME\") ".spaces[])
+            SUBNET_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="'$IF_SPACE'")'.cidr | cut -d \" -f 2 `
             case "$IF_SPACE" in
-                'data') SUBNET_CIDR=$SUBNETDATA_CIDR; IF_MODE='AUTO' ;;
-                'public') SUBNET_CIDR=$SUBNETPUB_CIDR; IF_MODE='AUTO' ;;
-                'storage') SUBNET_CIDR=$SUBNETSTOR_CIDR; IF_MODE='AUTO' ;;
-                'floating') SUBNET_CIDR=$SUBNETFLOAT_CIDR; IF_MODE='link_up' ;;
+                'data')     IF_MODE='AUTO' ;;
+                'public')   IF_MODE='AUTO' ;;
+                'storage')  IF_MODE='AUTO' ;;
+                'floating') IF_MODE='link_up' ;;
                 *) SUBNET_CIDR='null'; IF_MODE='null'; echo "      >>> Unknown SPACE" ;;
             esac
             echo "   >>> Configuring interface $IF_NAME [$IF_SPACE][$SUBNET_CIDR]"