From 230e6a9d6617d0cff1f941084779701475ef15b4 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 23 Dec 2015 09:37:28 -0600
Subject: modified intelpod5 interfaces to remove the need of special charms.

Change-Id: Ibf93074eb56807d6c3f9b0191bf02df063248f26
---
 ci/02-maasdeploy.sh | 61 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 44 insertions(+), 17 deletions(-)

(limited to 'ci/02-maasdeploy.sh')

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 7846cf11..5d00f5bb 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -75,15 +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=AUTO subnet=10.4.9.0/24
+        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
@@ -98,22 +118,6 @@ 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.
@@ -140,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
 
-- 
cgit 1.2.3-korg