X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-maasdeploy.sh;h=62e57da5eea750157ab9670ccb10e11d18f809d6;hb=619773c3be56822439e26c828bbdb3f173b03cff;hp=6fa003f3bb866716ebdba19b168bfbe5db4b6d80;hpb=b5b840d29c01826e0626034c060cdef460e9290d;p=joid.git

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 6fa003f3..62e57da5 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -3,39 +3,94 @@
 set -ex
 
 virtinstall=0
+labname=$1
 
-case "$1" in
-    'intelpod5' )
-        cp maas/intel/pod5/deployment.yaml ./deployment.yaml
-        ;;
-    'intelpod6' )
-        cp maas/intel/pod6/deployment.yaml ./deployment.yaml
-        ;;
-    'orangepod2' )
-        cp maas/orange/pod2/deployment.yaml ./deployment.yaml
-        ;;
-    'attvirpod1' )
-        cp maas/att/virpod1/deployment.yaml ./deployment.yaml
-        ;;
-    'juniperpod1' )
-        cp maas/juniper/pod1/deployment.yaml ./deployment.yaml
-        ;;
-    'cengnlynxpod1' )
-        cp maas/cengn_lynx/pod1/deployment.yaml ./deployment.yaml
-        ;;
-    'custom' )
-        cp maas/custom/deployment.yaml ./deployment.yaml
-        ;;
-    * )
-        virtinstall=1
-        ./cleanvm.sh
-        cp maas/default/deployment.yaml ./deployment.yaml
-        ;;
-esac
+#install the packages needed
+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-get update -y
+sudo apt-get dist-upgrade -y
+sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient python-congressclient gsutil -y
+
+#first parameter should be custom and second should be either 
+# absolute location of file (including file name) or url of the 
+# file to download.
+
+if [ "$1" == "custom" ]; then
+    if [ -e $2 ]; then
+        cp $2 ./labconfig.yaml || true
+        python deploy.py
+    else
+        wget $2 -t 3 -T 10 -O ./labconfig.yaml || true
+        count=`wc -l labconfig.yaml  | cut -d " " -f 1`
+
+        if [ $count -lt 10 ]; then
+            rm -rf labconfig.yaml
+        else
+            python deploy.py
+        fi
+    fi
 
-#just make sure the ssh keys added into maas for the current user
-sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml
-sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml
+    if [ ! -e ./labconfig.yaml ]; then
+        virtinstall=1
+        cp ../labconfig/default/deployment.yaml ./
+        cp ../labconfig/default/labconfig.yaml ./
+    fi
+    labname=`grep "maas_name" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+else
+    case "$1" in
+        'intelpod5' )
+            cp ../labconfig/intel/pod5/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
+            ;;
+        'intelpod6' )
+            cp ../labconfig/intel/pod6/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
+            ;;
+        'intelpod9' )
+            cp ../labconfig/intel/pod6/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
+            ;;
+        'orangepod1' )
+            cp ../labconfig/orange/pod1/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
+            ;;
+        'orangepod2' )
+            cp ../labconfig/orange/pod1/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
+            ;;
+        'attvirpod1' )
+            cp ../labconfig/att/virpod1/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
+            ;;
+        'juniperpod1' )
+            cp maas/juniper/pod1/deployment.yaml ./deployment.yaml
+            ;;
+        'cengnlynxpod1' )
+            cp maas/cengn_lynx/pod1/deployment.yaml ./deployment.yaml
+            ;;
+        'cengnpod1' )
+            cp ../labconfig/cengn/pod1/labconfig.yaml ./
+            #to be removed later once converted for all labs.
+            python deploy.py
+            ;;
+        * )
+            virtinstall=1
+            labname="default"
+            ./cleanvm.sh
+            cp ../labconfig/default/deployment.yaml ./
+            cp ../labconfig/default/deployconfig.yaml ./
+            ;;
+    esac
+fi
 
 #make sure no password asked during the deployment.
 
@@ -68,14 +123,6 @@ sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ |
 sudo virsh pool-start default || true
 sudo virsh pool-autostart default || true
 
-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:liberty -y
-sudo apt-get update -y
-sudo apt-get dist-upgrade -y
-sudo apt-get install openssh-server git maas-deployer juju juju-deployer maas-cli python-pip python-openstackclient gsutil -y
-
 # To avoid problem between apiclient/maas_client and apiclient from google
 # we remove the package google-api-python-client from yardstick installer
 if [ $(pip list |grep google-api-python-client |wc -l) == 1 ]; then
@@ -139,18 +186,25 @@ crnodevlanint() {
      done
  }
 
+#just make sure the ssh keys added into maas for the current user
+sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml
+sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml
+
+cp ./deployment.yaml ~/.juju/
+
+if [ -e ./deployconfig.yaml ]; then
+    cp ./deployconfig.yaml ~/.juju/
+fi
+
 sudo maas-deployer -c deployment.yaml -d --force
 
 sudo chown $USER:$USER environments.yaml
 
 echo "... Deployment of maas finish ...."
 
-maas_ip=`grep " ip_address" deployment.yaml | cut -d " "  -f 10`
+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 boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/daily/"
-#maas maas boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*"
-maas maas node-groups import-boot-images
 maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
 
 #Added the Qtip public to run the Qtip test after install on bare metal nodes.
@@ -189,31 +243,60 @@ if [ "$virtinstall" -eq 1 ]; then
     maas maas tag update-nodes compute add=$computenodeid
 fi
 
+#read interface needed in Auto mode and enable it. Will be rmeoved once auto enablement will be implemented in the maas-deployer.
+enable_if(){
+   if [ -e ~/.juju/deployconfig.yaml ]; then
+      cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
+
+      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
+   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 eth2|| true
-        crnodevlanint $vlan724 eth2|| true
-        enableautomodebyname eth2.721 AUTO "10.4.9.0/24" compute || true
-        enableautomodebyname eth2.721 AUTO "10.4.9.0/24" control || true
-        ;;
-    'intelpod6' )
+case "$labname" in
+    'intelpod9' )
         maas refresh
-        enableautomodebyname eth4 AUTO "10.6.12.0/24" compute || true
-        enableautomodebyname eth4 AUTO "10.6.12.0/24" control || true
-        ;;
-    'orangepod2' )
-        maas refresh
-        enableautomodebyname eth4 DHCP "192.168.22.0/24" compute || true
-        enableautomodebyname eth5 AUTO "192.168.12.0/24" compute || true
-        enableautomodebyname eth2 DHCP "192.168.22.0/24" control || true
-        enableautomodebyname eth3 AUTO "192.168.12.0/24" control || true
-        ;;
-    'attvirpod1' )
-        enableautomodebyname eth1 AUTO "192.168.10.0/24" control || true
+        crvlanupdsubnet vlan902 1 "DataNetwork" 902 2 || true
+        crvlanupdsubnet vlan905 2 "PublicNetwork" 905 3 || true
+        crnodevlanint $vlan902 eth0 || true
+        crnodevlanint $vlan905 eth1 || true
+        enableautomodebyname eth0.902 AUTO "10.9.12.0/24" compute || true
+        enableautomodebyname eth1.905 AUTO "10.9.15.0/24" compute || true
+        enableautomodebyname eth0.902 AUTO "10.9.12.0/24" control || true
+        enableautomodebyname eth1.905 AUTO "10.9.15.0/24" control || true
         ;;
     'juniperpod1' )
         ;;
@@ -228,7 +311,6 @@ case "$1" in
         ;;
 esac
 
-echo " .... MAAS deployment finished successfully ...."
+enable_if
 
-#echo "... Deployment of opnfv release Started ...."
-#python deploy.py $maas_ip
+echo " .... MAAS deployment finished successfully ...."