X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-maasdeploy.sh;h=5d00f5bb2f0d9f8a78dd1df5a9288cdc93ba0aba;hb=230e6a9d6617d0cff1f941084779701475ef15b4;hp=8ef8565e5803302106251488b0f93f2c27fbe412;hpb=593a7ad51333b5255218ead6642d900aa2809dab;p=joid.git

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 8ef8565e..5d00f5bb 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -75,6 +75,35 @@ if [ "$virtinstall" -eq 1 ]; then
     sudo virsh net-start default
 fi
 
+#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 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
+    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`
+
+    for nodes in $listofnodes
+    do
+        parentid=`maas maas interface read $nodes eth2 | grep interfaces | cut -d '/' -f 8`
+        maas maas interfaces create-vlan $nodes vlan=$1 parent=$parentid
+     done
+ }
+
 sudo maas-deployer -c deployment.yaml -d --force
 
 sudo chown $USER:$USER environments.yaml
@@ -92,12 +121,12 @@ maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
 #adding compute and control nodes VM to MAAS for 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 --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node1-control
+    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
 
     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 --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node2-compute
 
-    node1controlmac=`grep  "mac address" node1-control | cut -d "'" -f 2`
-    node2computemac=`grep  "mac address" node2-compute | cut -d "'" -f 2`
+    node1controlmac=`grep  "mac address" node1-control | head -1 | cut -d "'" -f 2`
+    node2computemac=`grep  "mac address" node2-compute | head -1 | cut -d "'" -f 2`
 
     sudo virsh -c qemu:///system define --file node1-control
     sudo virsh -c qemu:///system define --file node2-compute
@@ -115,6 +144,29 @@ if [ "$virtinstall" -eq 1 ]; then
 
 fi
 
+# Enable vlan interfaces with maas
+case "$1" in
+    'intelpod5' )
+        maas refresh
+        crvlanupdsubnet vlan721 1 "DataNetwork" 721 2 || true
+        crvlanupdsubnet vlan724 2 "PublicNetwork" 724 3 || true
+        crnodevlanint $vlan721 || true
+        crnodevlanint $vlan724 || true
+        enableautomode eth2.721 AUTO "10.4.9.0/24" || true
+        ;;
+    'intelpod6' )
+        enableautomode eth1 AUTO "10.4.9.0/24" || true
+        ;;
+    'orangepod2' )
+        ;;
+    'attvirpod1' )
+        ;;
+    'juniperpod1' )
+        ;;
+esac
+
+echo " .... MAAS deployment finished successfully ...."
+
 #echo "... Deployment of opnfv release Started ...."
 #python deploy.py $maas_ip