X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-maasdeploy.sh;h=da0e88350105c2260dde56f503b18e63e85c3e41;hb=23b5d947cce41f6f50bb6c692708c7e070cf8b01;hp=290197c5173310a3cfaa4d561f63213ccd9652e0;hpb=4aa9b505a8c9001a9b8af6d9199422254e148842;p=joid.git

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 290197c5..da0e8835 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -31,9 +31,9 @@ esac
 echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init
 
 if [ -e /etc/sudoers.d/90-joid-init ]; then
-    cp /etc/sudoers.d/90-joid-init 91-joid-init
+    sudo cp /etc/sudoers.d/90-joid-init 91-joid-init
     cat 90-joid-init >> 91-joid-init
-    sudo chown root:root 90-joid-init
+    sudo chown root:root 91-joid-init
     sudo mv 91-joid-init /etc/sudoers.d/
 else
     sudo chown root:root 90-joid-init
@@ -75,15 +75,49 @@ 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=AUTO subnet=10.4.9.0/24
+        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() {
+    if [ ! -z "$4" ]; then
+        for i in `seq 1 7`;
+        do
+            nodes=`maas maas nodes list hostname=node$i-$4 | grep system_id | cut -d '"' -f 4`
+            if [ ! -z "$nodes" ]; then
+                maas maas interface link-subnet $nodes $1  mode=$2 subnet=$3
+            fi
+       done
+    fi
+}
+
+#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
@@ -98,31 +132,15 @@ maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/d
 maas maas boot-resources import
 maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
 
-# Enable interfaces with maas
-case "$1" in
-    'intelpod5' )
-        ;;
-    'intelpod6' )
-        enableautomode eth1 || true
-        ;;
-    'orangepod2' )
-        ;;
-    'attvirpod1' )
-        ;;
-    'juniperpod1' )
-        ;;
-esac
-
-
 #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
+    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
 
-    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
@@ -140,6 +158,37 @@ 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
+        enableautomodebyname eth2.721 AUTO "10.4.9.0/24" compute || true
+        enableautomodebyname eth2.721 AUTO "10.4.9.0/24" control || true
+        ;;
+    'intelpod6' )
+        maas refresh
+        enableautomodebyname eth1 AUTO "10.4.9.0/24" compute || true
+        enableautomodebyname eth1 AUTO "10.4.9.0/24" control || true
+        ;;
+    'orangepod2' )
+        maas refresh
+        enableautomodebyname eth4 AUTO "192.168.22.0/24" compute || true
+        enableautomodebyname eth5 AUTO "192.168.12.0/24" compute || true
+        enableautomodebyname eth2 AUTO "192.168.22.0/24" control || true
+        enableautomodebyname eth3 AUTO "192.168.12.0/24" control || true
+        ;;
+    'attvirpod1' )
+        ;;
+    'juniperpod1' )
+        ;;
+esac
+
+echo " .... MAAS deployment finished successfully ...."
+
 #echo "... Deployment of opnfv release Started ...."
 #python deploy.py $maas_ip