X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F03-maasdeploy.sh;h=329931e2c27e541e29de60ff98fc4aee04418b73;hb=36a495e8d20149811d13f6ba944ecc30a393aed4;hp=f50775c94785b08bd6b146d65ec5447448558828;hpb=501abc68e6a974d7e5dd480233bf44a2f20fc0b3;p=joid.git

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index f50775c9..329931e2 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -5,46 +5,45 @@ set -ex
 virtinstall=0
 labname=$1
 
+if [ ! -e $HOME/.ssh/id_rsa ]; then
+    ssh-keygen -N '' -f $HOME/.ssh/id_rsa
+fi
+
 #install the packages needed
-sudo apt-add-repository ppa:opnfv-team/proposed -y
-sudo apt-add-repository ppa:maas-deployers/stable -y
 sudo apt-add-repository ppa:juju/stable -y
 sudo apt-add-repository ppa:maas/stable -y
-sudo apt-add-repository cloud-archive:mitaka -y
+sudo apt-add-repository cloud-archive:newton -y
 sudo apt-get update -y
-sudo apt-get dist-upgrade -y
-sudo apt-get install openssh-server bzr git maas-deployer juju juju-deployer \
-             maas-cli python-pip python-psutil python-openstackclient \
-             python-congressclient gsutil charm-tools pastebinit juju-core -y
+#sudo apt-get dist-upgrade -y
+sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin juju \
+             maas maas-region-controller python-pip python-psutil python-openstackclient \
+             python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \
+             openssh-server vlan ipmitool jq expect -y
+
+sudo pip install --upgrade pip
 
 #first parameter should be custom and second should be either
 # absolute location of file (including file name) or url of the
 # file to download.
 
-labname=$1
-labfile=$2
 
 #
 # Config preparation
 #
 
-# Get labconfig and generate deployment.yaml for MAAS and deployconfig.yaml
+# Get labconfig and generate deployconfig.yaml
 case "$labname" in
     intelpod[569]|orangepod[12]|cengnpod[12] )
         array=(${labname//pod/ })
         cp ../labconfig/${array[0]}/pod${array[1]}/labconfig.yaml .
-        python genMAASConfig.py -l labconfig.yaml > deployment.yaml
         python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
         ;;
     'attvirpod1' )
         cp ../labconfig/att/virpod1/labconfig.yaml .
-        python genMAASConfig.py -l labconfig.yaml > deployment.yaml
         python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
         ;;
-    'juniperpod1' )
-        cp maas/juniper/pod1/deployment.yaml ./deployment.yaml
-        ;;
     'custom')
+        labfile=$2
         if [ -e $labfile ]; then
             cp $labfile ./labconfig.yaml || true
         else
@@ -56,24 +55,58 @@ case "$labname" in
         fi
         if [ ! -e ./labconfig.yaml ]; then
             virtinstall=1
+            labname="default"
+            cp ../labconfig/default/labconfig.yaml ./
+            cp ../labconfig/default/deployconfig.yaml ./
         else
-            python genMAASConfig.py -l labconfig.yaml > deployment.yaml
             python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
-            labname=`grep "maas_name" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+            labname=`grep "maas_name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
         fi
         ;;
     * )
         virtinstall=1
+        labname="default"
+        cp ../labconfig/default/labconfig.yaml ./
+        python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml
         ;;
 esac
 
-# In the case of a virtual deployment get deployment.yaml and deployconfig.yaml
+python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < labconfig.yaml > labconfig.json
+python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < deployconfig.yaml > deployconfig.json
+
+MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //')
+MAAS_NAME=`grep "maas_name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+API_SERVER="http://$MAAS_IP/MAAS/api/2.0"
+API_SERVERMAAS="http://$MAAS_IP/MAAS/"
+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/
+KEYRING_FILE=/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg
+SOURCE_ID=1
+FABRIC_ID=1
+PRIMARY_RACK_CONTROLLER="$MAAS_IP"
+SUBNET_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.cidr | cut -d \" -f 2 `
+SUBNETDATA_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.cidr | cut -d \" -f 2 `
+SUBNETPUB_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="public")'.cidr | cut -d \" -f 2 `
+SUBNETSTOR_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="storage")'.cidr | cut -d \" -f 2 `
+SUBNETFLOAT_CIDR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="floating")'.cidr | cut -d \" -f 2 `
+VLAN_TAG="untagged"
+
+# In the case of a virtual deployment get deployconfig.yaml
 if [ "$virtinstall" -eq 1 ]; then
-    labname="default"
     ./cleanvm.sh || true
-    cp ../labconfig/default/deployment.yaml ./
-    cp ../labconfig/default/labconfig.yaml ./
-    cp ../labconfig/default/deployconfig.yaml ./
+fi
+
+#create backup directory
+mkdir ~/joid_config/ || true
+
+# Backup deployconfig.yaml in joid_config folder
+
+if [ -e ./deployconfig.yaml ]; then
+    cp ./deployconfig.yaml ~/joid_config/
+    cp ./labconfig.yaml ~/joid_config/
 fi
 
 #
@@ -81,24 +114,18 @@ fi
 #
 
 # make sure no password asked during the deployment.
-echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init
-
-if [ -e /etc/sudoers.d/90-joid-init ]; then
-    sudo cp /etc/sudoers.d/90-joid-init 91-joid-init
-    sudo chown $USER:$USER 91-joid-init
-    sudo chmod 660 91-joid-init
-    sudo cat 90-joid-init >> 91-joid-init
-    sudo chown root:root 91-joid-init
-    sudo mv 91-joid-init /etc/sudoers.d/
+sudoer_file=/etc/sudoers.d/90-joid-init
+sudoer_entry="$USER ALL=(ALL) NOPASSWD:ALL"
+if [ -e $sudoer_file ]; then
+    if ! sudo grep -q "$sudoer_entry" $sudoer_file; then
+        sudo sed -i -e "1i$sudoer_entry" $sudoer_file
+    fi
 else
+    echo "$sudoer_entry" > 90-joid-init
     sudo chown root:root 90-joid-init
     sudo mv 90-joid-init /etc/sudoers.d/
 fi
 
-if [ ! -e $HOME/.ssh/id_rsa ]; then
-    ssh-keygen -N '' -f $HOME/.ssh/id_rsa
-fi
-
 echo "... Deployment of maas Started ...."
 
 #
@@ -107,7 +134,6 @@ echo "... Deployment of maas Started ...."
 
 # define the pool and try to start even though its already exist.
 # For fresh install this may or may not there.
-sudo apt-get install libvirt-bin -y
 sudo adduser $USER libvirtd
 sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ || true
 sudo virsh pool-start default || true
@@ -121,12 +147,9 @@ if [ "$virtinstall" -eq 1 ]; then
     sudo virsh net-define default-net-org.xml
     sudo virsh net-destroy default
     sudo virsh net-start default
+    rm -f default-net-org.xml
 fi
 
-# Ensure virsh can connect without ssh auth
-cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
-
-
 #
 # Cleanup, juju init and config backup
 #
@@ -137,123 +160,310 @@ if [ $(pip list |grep google-api-python-client |wc -l) == 1 ]; then
     sudo pip uninstall google-api-python-client
 fi
 
-#create backup directory
-mkdir ~/joid_config/ || true
-mkdir ~/.juju/ || true
 
-# Init Juju
-juju init -f || true
+if [ ! -e ~maas/.ssh/id_rsa.pub ]; then
+    if [ ! -e $HOME/id_rsa_maas.pub ]; then
+        [ -e $HOME/id_rsa_maas ] && rm -f $HOME/id_rsa_maas
+        sudo su - $USER -c "echo |ssh-keygen -t rsa -f $HOME/id_rsa_maas"
+    fi
+    sudo -u maas mkdir ~maas/.ssh/ || true
+    sudo cp $HOME/id_rsa_maas ~maas/.ssh/id_rsa
+    sudo cp $HOME/id_rsa_maas.pub ~maas/.ssh/id_rsa.pub
+    sudo chown maas:maas ~maas/.ssh/id_rsa
+    sudo chown maas:maas ~maas/.ssh/id_rsa.pub
+fi
+
+# Ensure virsh can connect without ssh auth
+sudo cat ~maas/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
+sudo cat $HOME/.ssh/id_rsa.pub >> $HOME/.ssh/authorized_keys
 
 #
 # MAAS deploy
 #
 
 installmaas(){
-    sudo apt-get install maas -y
-
-
+    sudo apt-get install maas maas-region-controller -y
 }
 
+#
+# MAAS config
+# https://insights.ubuntu.com/2016/01/23/maas-setup-deploying-openstack-on-maas-1-9-with-juju/
+# http://blog.naydenov.net/2016/01/nodes-networking-deploying-openstack-on-maas-1-9-with-juju/
+#
 configuremaas(){
-    sudo maas createadmin --username=ubuntu --email=ubuntu@ubuntu.com
-}
+    #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
+    sleep 30
+    sudo maas-rack config --region-url http://$MAAS_IP:5240/MAAS
+
+    sudo maas createadmin --username=ubuntu --email=ubuntu@ubuntu.com --password=ubuntu || true
+    API_KEY=`sudo maas-region apikey --username=ubuntu`
+    maas login $PROFILE $API_SERVERMAAS $API_KEY
+    maas $PROFILE maas set-config name='main_archive' value=$MAIN_ARCHIVE || true
+    maas $PROFILE maas set-config name=upstream_dns value=$MY_UPSTREAM_DNS || true
+    maas $PROFILE maas set-config name='maas_name' value=$MAAS_NAME || true
+    maas $PROFILE maas set-config name='ntp_server' value='ntp.ubuntu.com' || true
+    maas $PROFILE sshkeys create "key=$SSH_KEY" || true
+
+    for tag in bootstrap compute control storage
+    do
+        maas $PROFILE tags create name=$tag || true
+    done
 
-addnodes(){
+    #create the required spaces.
+    maas $PROFILE space update 0 name=default || true
+    for space in unused admin-api internal-api public-api compute-data \
+                 compute-external storage-data storage-cluster
+    do
+        echo "Creating the space $space"
+        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-resources import || true
+    #sleep 60
 
+    while [ "$(maas $PROFILE boot-resources is-importing)" == "true" ];
+    do
+        sleep 60
+    done
 }
 
-sudo maas-deployer -c deployment.yaml -d --force
+enablesubnetanddhcp(){
+    TEMP_CIDR=$1
+    enabledhcp=$2
+    space=$3
 
-sudo chown $USER:$USER environments.yaml
+    SUBNET_PREFIX=${TEMP_CIDR::-5}
 
-echo "... Deployment of maas finish ...."
+    IP_RES_RANGE_LOW="$SUBNET_PREFIX.1"
+    IP_RES_RANGE_HIGH="$SUBNET_PREFIX.39"
 
-# Backup deployment.yaml and deployconfig.yaml in .juju folder
+    API_KEY=`sudo maas-region apikey --username=ubuntu`
+    maas login $PROFILE $API_SERVERMAAS $API_KEY
 
-cp ./environments.yaml ~/.juju/
-cp ./environments.yaml ~/joid_config/
+    maas $PROFILE ipranges create type=reserved \
+         start_ip=$IP_RES_RANGE_LOW end_ip=$IP_RES_RANGE_HIGH \
+         comment='This is a reserved range' || true
 
-if [ -e ./deployconfig.yaml ]; then
-    cp ./deployconfig.yaml ~/.juju/
-    cp ./labconfig.yaml ~/.juju/
-    cp ./deployconfig.yaml ~/joid_config/
-    cp ./labconfig.yaml ~/joid_config/
-fi
+    IP_DYNAMIC_RANGE_LOW="$SUBNET_PREFIX.40"
+    IP_DYNAMIC_RANGE_HIGH="$SUBNET_PREFIX.150"
 
-if [ -e ./deployment.yaml ]; then
-    cp ./deployment.yaml ~/.juju/
-    cp ./deployment.yaml ~/joid_config/
-fi
+    maas $PROFILE ipranges create type=dynamic \
+        start_ip=$IP_DYNAMIC_RANGE_LOW end_ip=$IP_DYNAMIC_RANGE_HIGH \
+        comment='This is a reserved dynamic range' || true
 
-#
-# MAAS Customization
-#
-
-maas_ip=`grep " ip_address" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
-apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2`
-maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey}
-maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
+    FABRIC_ID=$(maas $PROFILE subnet read $TEMP_CIDR | jq '.vlan.fabric_id')
 
-#Added the Qtip public to run the Qtip test after install on bare metal nodes.
-#maas maas sshkeys new key="`cat ./maas/sshkeys/QtipKey.pub`"
-#maas maas sshkeys new key="`cat ./maas/sshkeys/DominoKey.pub`"
+    PRIMARY_RACK_CONTROLLER=$(maas $PROFILE rack-controllers read | jq -r '.[0].system_id')
 
-#adding compute and control nodes VM to MAAS for virtual deployment purpose.
-if [ "$virtinstall" -eq 1 ]; then
-    # create two more VMs to do the deployment.
-    sudo virt-install --connect qemu:///system --name node1-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
+    if [ "$space" == "admin" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.gateway | cut -d \" -f 2 `
+        #MY_NAMESERVER=`cat deployconfig.json | jq '.opnfv.upstream_dns' | cut -d \" -f 2`
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #maas $PROFILE subnet update $TEMP_CIDR dns_servers=$MY_NAMESERVER || true
+        #below command will enable the interface with internal-api space.
+        SPACEID=$(maas $PROFILE space read internal-api | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    elif [ "$space" == "data" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.gateway | cut -d \" -f 2 `
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #below command will enable the interface with data-api space for data network.
+        SPACEID=$(maas $PROFILE space read admin-api | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    elif [ "$space" == "public" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.public | cut -d \" -f 2 `
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #below command will enable the interface with public-api space for data network.
+        SPACEID=$(maas $PROFILE space read public-api | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    elif [ "$space" == "storage" ]; then
+        MY_GATEWAY=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="data")'.storage | cut -d \" -f 2 `
+        if ([ $MY_GATEWAY ] && [ "$MY_GATEWAY" != "null" ]); then
+            maas $PROFILE subnet update $TEMP_CIDR gateway_ip=$MY_GATEWAY || true
+        fi
+        #below command will enable the interface with public-api space for data network.
+        SPACEID=$(maas $PROFILE space read storage-data | jq '.id')
+        maas $PROFILE subnet update $TEMP_CIDR space=$SPACEID || true
+        if [ "$enabledhcp" == "true" ]; then
+            maas $PROFILE vlan update $FABRIC_ID $VLAN_TAG dhcp_on=True primary_rack=$PRIMARY_RACK_CONTROLLER || true
+        fi
+    fi
+}
 
-    sudo virt-install --connect qemu:///system --name node2-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
+addnodes(){
+    API_KEY=`sudo maas-region apikey --username=ubuntu`
+    maas login $PROFILE $API_SERVERMAAS $API_KEY
 
-    sudo virt-install --connect qemu:///system --name node5-compute --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node5-compute
+    # make sure there is no machine entry in maas
+    for m in $(maas $PROFILE machines read | jq -r '.[].system_id')
+    do
+        maas ubuntu machine delete $m
+    done
 
-    node1controlmac=`grep  "mac address" node1-control | head -1 | cut -d "'" -f 2`
-    node2computemac=`grep  "mac address" node2-compute | head -1 | cut -d "'" -f 2`
-    node5computemac=`grep  "mac address" node5-compute | head -1 | cut -d "'" -f 2`
+    if [ "$virtinstall" -eq 1 ]; then
+        netw=" --network bridge=virbr0,model=virtio"
+    else
+        brid=`brctl show | grep 8000 | cut -d "8" -f 1 |  tr "\n" " " | tr "\t" " " | tr -s " "`
+
+        netw=""
+        for feature in $brid; do
+            if [ "$feature" == "" ]; then
+                netw=$netw
+            elif [ "$feature" == "virbr0" ]; then
+                netw=$netw
+            else
+                netw=$netw" --network bridge="$feature",model=virtio"
+            fi
+        done
+    fi
 
-    sudo virsh -c qemu:///system define --file node1-control
-    sudo virsh -c qemu:///system define --file node2-compute
-    sudo virsh -c qemu:///system define --file node5-compute
+    sudo virt-install --connect qemu:///system --name bootstrap --ram 4098 --cpu host --vcpus 2 --video \
+                 cirrus --arch x86_64 --disk size=20,format=qcow2,bus=virtio,io=native,pool=default \
+                 $netw --boot network,hd,menu=off --noautoconsole \
+                 --vnc --print-xml | tee bootstrap
+
+    if [ "$virtinstall" -eq 1 ]; then
+        bootstrapmac=`grep  "mac address" bootstrap | head -1 | cut -d '"' -f 2`
+    else
+        bootstrapmac=""
+        bootstrapmacs=`grep  "mac address" bootstrap| cut -d '"' -f 2`
+        for mac in $bootstrapmacs; do
+            bootstrapmac=$bootstrapmac" mac_addresses="$mac
+        done
+    fi
+    sudo virsh -c qemu:///system define --file bootstrap
+    rm -f bootstrap
+
+    maas $PROFILE machines create autodetect_nodegroup='yes' name='bootstrap' \
+        tags='bootstrap' hostname='bootstrap' power_type='virsh' mac_addresses=$bootstrapmac \
+        power_parameters_power_address='qemu+ssh://'$USER'@'$MAAS_IP'/system' \
+        architecture='amd64/generic' power_parameters_power_id='bootstrap'
+
+    bootstrapid=$(maas $PROFILE machines read | jq -r '.[] | select(.hostname == "bootstrap").system_id')
+
+    maas $PROFILE tag update-nodes bootstrap add=$bootstrapid
+
+    if [ "$virtinstall" -eq 1 ]; then
+        units=`cat deployconfig.json | jq .opnfv.units`
+
+        until [ $(($units)) -lt 1 ]; do
+           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 \
+                     --disk size=120,format=qcow2,bus=virtio,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
+            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' \
+                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
+            maas $PROFILE tag update-nodes compute add=$nodeid || true
+        done
+    else
+       units=`cat deployconfig.json | jq .opnfv.units`
+
+       until [ $(($units)) -lt 1 ]; do
+           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 `
+           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 `
+           POWER_PASS=`cat labconfig.json |  jq ".lab.racks[].nodes[$units].power.pass" | cut -d \" -f 2 `
+
+           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'
+       done
+    fi
 
-    maas maas tags new name='control'
-    maas maas tags new name='compute'
+    # make sure nodes are added into MAAS and none of them is in commisoning state
+    while [ "$(maas $PROFILE nodes read | grep  Commissioning )" ];
+    do
+        sleep 60
+    done
 
-    controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node1-control' tags='control' hostname='node1-control' power_type='virsh' mac_addresses=$node1controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node1-control' | grep system_id | cut -d '"' -f 4 `
+}
 
-    maas maas tag update-nodes control add=$controlnodeid
+#configure MAAS with the different options.
+configuremaas
 
-    computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node2-compute' tags='compute' hostname='node2-compute' power_type='virsh' mac_addresses=$node2computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node2-compute' | grep system_id | cut -d '"' -f 4 `
+# functioncall with subnetid to add and second parameter is dhcp enable
+# third parameter will define the space. It is required to have admin
 
-    maas maas tag update-nodes compute add=$computenodeid
+if [ $SUBNET_CIDR ]; then
+    enablesubnetanddhcp $SUBNET_CIDR true admin
+else
+    echo "atleast admin network should be defined"
+    echo "MAAS configuration can not continue"
+    exit 2
+fi
 
-    computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node5-compute' tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node5-compute' | grep system_id | cut -d '"' -f 4 `
+if [ $SUBNETDATA_CIDR ]; then
+    enablesubnetanddhcp $SUBNETDATA_CIDR false data
+fi
+if [ $SUBNETPUB_CIDR ]; then
+    enablesubnetanddhcp $SUBNETPUB_CIDR false public
+fi
 
-    maas maas tag update-nodes compute add=$computenodeid
+if [ $SUBNETSTOR_CIDR ]; then
+    enablesubnetanddhcp $SUBNETSTOR_CIDR false storage
 fi
 
+#just make sure rack controller has been synced and import only
+# just whether images have been imported or not.
+sleep 120
+
+#lets add the nodes now. Currently works only for virtual deploymnet.
+addnodes
+
+echo "... Deployment of maas finish ...."
+
+#Added the Qtip public to run the Qtip test after install on bare metal nodes.
+#maas $PROFILE sshkeys new key="`cat ./maas/sshkeys/QtipKey.pub`"
+#maas $PROFILE sshkeys new key="`cat ./maas/sshkeys/DominoKey.pub`"
+
 #
 # Functions for MAAS network customization
 #
 
-#Below function will mark the interfaces in Auto mode to enbled by MAAS
-enableautomode() {
-    listofnodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4`
-    for nodes in $listofnodes
-    do
-        maas maas interface link-subnet $nodes $1  mode=$2 subnet=$3
-    done
-}
-
 #Below function will mark the interfaces in Auto mode to enbled by MAAS
 # using hostname of the node added into MAAS
 enableautomodebyname() {
+    API_KEY=`sudo maas-region apikey --username=ubuntu`
+    maas login $PROFILE $API_SERVERMAAS $API_KEY
+
     if [ ! -z "$4" ]; then
         for i in `seq 1 7`;
         do
-            nodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4`
+            nodes=$(maas $PROFILE nodes read | jq -r '.[].system_id')
             if [ ! -z "$nodes" ]; then
-                maas maas interface link-subnet $nodes $1  mode=$2 subnet=$3
+                maas $PROFILE interface link-subnet $nodes $1  mode=$2 subnet=$3 || true
             fi
        done
     fi
@@ -262,51 +472,58 @@ enableautomodebyname() {
 #Below function will create vlan and update interface with the new vlan
 # will return the vlan id created
 crvlanupdsubnet() {
-    newvlanid=`maas maas vlans create $2 name=$3 vid=$4 | grep resource | cut -d '/' -f 6 `
-    maas maas subnet update $5 vlan=$newvlanid
+    API_KEY=`sudo maas-region apikey --username=ubuntu`
+    maas login $PROFILE $API_SERVERMAAS $API_KEY
+
+    # TODO: fix subnet creation and use 'jq'
+    newvlanid=`maas $PROFILE vlans create $2 name=$3 vid=$4 | grep resource | cut -d '/' -f 6 `
+    maas $PROFILE subnet update $5 vlan=$newvlanid
     eval "$1"="'$newvlanid'"
 }
 
 #Below function will create interface with new vlan and bind to physical interface
 crnodevlanint() {
-    listofnodes=`maas maas nodes list | grep system_id | cut -d '"' -f 4`
+    API_KEY=`sudo maas-region apikey --username=ubuntu`
+    maas login $PROFILE $API_SERVERMAAS $API_KEY
 
-    for nodes in $listofnodes
+    for node in $(maas $PROFILE nodes read | jq -r '.[].system_id')
     do
-        parentid=`maas maas interface read $nodes $2 | grep interfaces | cut -d '/' -f 8`
-        maas maas interfaces create-vlan $nodes vlan=$1 parent=$parentid
+        vlanid=$(maas $PROFILE subnets read | jq '.[].vlan | select(.vid=='$1')'.id)
+        fabricid=`maas $PROFILE subnets read | jq '.[].vlan | select(.vid=='$1')'.fabric_id`
+        interface=`maas $PROFILE interfaces read $node | jq '.[] | select(.vlan.fabric_id=='$fabricid')'.id`
+        maas $PROFILE interfaces create-vlan $node vlan=$vlanid parent=$interface || true
      done
  }
 
 #function for JUJU envronment
 
 addcredential() {
-    controllername=`awk 'NR==1{print $2}' environments.yaml`
-    cloudname=`awk 'NR==1{print $2}' environments.yaml`
+    API_KEY=`sudo maas-region apikey --username=ubuntu`
+    controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
+    cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
 
     echo  "credentials:" > credential.yaml
     echo  "  $controllername:" >> credential.yaml
     echo  "    opnfv-credentials:" >> credential.yaml
     echo  "      auth-type: oauth1" >> credential.yaml
-    echo  "      maas-oauth: $apikey" >> credential.yaml
+    echo  "      maas-oauth: $API_KEY" >> credential.yaml
 
     juju add-credential $controllername -f credential.yaml --replace
 }
 
 addcloud() {
-    controllername=`awk 'NR==1{print $2}' environments.yaml`
-    cloudname=`awk 'NR==1{print $2}' environments.yaml`
+    controllername=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
+    cloudname=`awk 'NR==1{print substr($1, 1, length($1)-1)}' deployconfig.yaml`
 
     echo "clouds:" > maas-cloud.yaml
     echo "   $cloudname:" >> maas-cloud.yaml
     echo "      type: maas" >> maas-cloud.yaml
     echo "      auth-types: [oauth1]" >> maas-cloud.yaml
-    echo "      endpoint: http://$maas_ip/MAAS" >> maas-cloud.yaml
+    echo "      endpoint: $API_SERVERMAAS" >> maas-cloud.yaml
 
     juju add-cloud $cloudname maas-cloud.yaml --replace
 }
 
-
 #
 # VLAN customization
 #
@@ -328,55 +545,73 @@ esac
 #
 # Enable MAAS nodes interfaces
 #
+API_KEY=`sudo maas-region apikey --username=ubuntu`
+maas login $PROFILE $API_SERVERMAAS $API_KEY
+
+if [ -e ./labconfig.json ]; then
+    # We will configure all node, so we need the qty, and loop on it
+    NODE_QTY=$(cat labconfig.json | jq --raw-output '.lab.racks[0].nodes[]'.name | wc -l)
+    NODE_QTY=$((NODE_QTY-1))
+    for NODE_ID in $(seq 0 $NODE_QTY); do
+        # Get the NAME/SYS_ID of this node
+        NODE_NAME=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].name")
+        NODE_SYS_ID=$(maas $PROFILE nodes read | jq -r ".[] |  select(.hostname==\"$NODE_NAME\")".system_id)
+        echo ">>> Configuring node $NODE_NAME [$NODE_ID][$NODE_SYS_ID]"
+        # Recover the network interfaces list and configure each one
+        #   with sorting the list, we have hardware interface first the vlan interfaces
+        IF_LIST=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] ".ifname | sort -u)
+        for IF_NAME in $IF_LIST; do
+            IF_SPACE=$(cat labconfig.json | jq --raw-output ".lab.racks[0].nodes[$NODE_ID].nics[] | select(.ifname==\"$IF_NAME\") ".spaces[])
+            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' ;;
+                *) SUBNET_CIDR='null'; IF_MODE='null'; echo "      >>> Unknown SPACE" ;;
+            esac
+            echo "   >>> Configuring interface $IF_NAME [$IF_SPACE][$SUBNET_CIDR]"
+
+            # if we have a vlan parameter in the space config
+            IF_VLAN=$(cat labconfig.json | jq --raw-output ".opnfv.spaces[] | select(.type==\"$IF_SPACE\")".vlan)
+            if ([ -z $IF_VLAN ] && [ $IF_NAME =~ \. ]); then
+                # We have no vlan specified on spaces, but we have a vlan subinterface
+                IF_VLAN = ${IF_NAME##*.}; fi
+
+            # In case of a VLAN interface
+            if ([ $IF_VLAN ] && [ "$IF_VLAN" != "null" ]); then
+                echo "      >>> Configuring VLAN $IF_VLAN"
+                VLANID=$(maas $PROFILE subnets read | jq ".[].vlan | select(.vid==$IF_VLAN)".id)
+                FABRICID=$(maas $PROFILE subnets read | jq ".[].vlan | select(.vid==$IF_VLAN)".fabric_id)
+                INTERFACE=$(maas $PROFILE interfaces read $NODE_SYS_ID | jq ".[] | select(.vlan.fabric_id==$FABRICID)".id)
+                if [[ -z $INTERFACE ]]; then
+                    # parent interface is not set because it does not have a SUBNET_CIDR
+                    PARENT_VLANID=$(maas $PROFILE fabrics read | jq ".[].vlans[] | select(.fabric_id==$FABRICID and .name==\"untagged\")".id)
+                    # We set the physical interface to the targeted fabric
+                    PARENT_IF_NAME=${IF_NAME%%.*}
+                    maas $PROFILE interface update $NODE_SYS_ID $PARENT_IF_NAME vlan=$PARENT_VLANID
+                    sleep 3
+                    INTERFACE=$(maas $PROFILE interfaces read $NODE_SYS_ID | jq ".[] | select(.vlan.fabric_id==$FABRICID)".id)
+                fi
+                maas $PROFILE interfaces create-vlan $NODE_SYS_ID vlan=$VLANID parent=$INTERFACE || true
+            fi
 
-#read interface needed in Auto mode and enable it. Will be rmeoved once auto enablement will be implemented in the maas-deployer.
-if [ -e ~/joid_config/deployconfig.yaml ]; then
-  cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml
-elif [ -e ~/.juju/deployconfig.yaml ]; then
-  cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
-fi
-
-  enableiflist=`grep "interface-enable" deployconfig.yaml | cut -d ' ' -f 4 `
-  datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-  stornet=`grep "storageNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-  pubnet=`grep "publicNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
-
-  # split EXTERNAL_NETWORK=first ip;last ip; gateway;network
-
-  if [ "$datanet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
-      i="0"
-      while [ ! -z "${EXTNET[i]}" ];
-      do
-          enableautomode ${EXTNET[i]} AUTO $datanet || true
-          i=$[$i+1]
-      done
-  fi
-  if [ "$stornet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
-      i="0"
-      while [ ! -z "${EXTNET[i]}" ];
-      do
-          enableautomode ${EXTNET[i]} AUTO $stornet || true
-          i=$[$i+1]
-      done
-  fi
-  if [ "$pubnet" != "''" ]; then
-      EXTNET=(${enableiflist//,/ })
-      i="0"
-      while [ ! -z "${EXTNET[i]}" ];
-      do
-          enableautomode ${EXTNET[i]} AUTO $pubnet || true
-          i=$[$i+1]
-      done
-  fi
+            # Configure the interface
+            if ([ $SUBNET_CIDR ] && [ "$SUBNET_CIDR" != "null" ]); then
+                VLANID=$(maas $PROFILE subnet read $SUBNET_CIDR | jq -r '.vlan.id')
+                maas $PROFILE interface update $NODE_SYS_ID $IF_NAME vlan=$VLANID
+                maas $PROFILE interface link-subnet $NODE_SYS_ID $IF_NAME  mode=$IF_MODE subnet=$SUBNET_CIDR || true
+                sleep 5
+            else
+                echo "      >>> Not configuring, we have an empty Subnet CIDR"
+            fi
+        done
+    done
 fi
 
-
 # Add the cloud and controller credentials for MAAS for that lab.
 jujuver=`juju --version`
 
-if [ "$jujuver" > "2" ]; then
+if [[ "$jujuver" > "2" ]]; then
     addcloud
     addcredential
 fi