X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-maasdeploy.sh;h=cc41ecf10e19bb588234cda99f901f852c4d91d6;hb=refs%2Fchanges%2F11%2F13811%2F1;hp=0efbb1d83cc47c0c5c60fef413fa49b3bed7dd9e;hpb=b07f003cdcbc7f6e07d7478706bd071d445259e5;p=joid.git

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index 0efbb1d8..cc41ecf1 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -11,6 +11,9 @@ case "$1" in
     'intelpod6' )
         cp maas/intel/pod6/deployment.yaml ./deployment.yaml
         ;;
+    'orangepod1' )
+        cp maas/orange/pod1/deployment.yaml ./deployment.yaml
+        ;;
     'orangepod2' )
         cp maas/orange/pod2/deployment.yaml ./deployment.yaml
         ;;
@@ -37,7 +40,7 @@ esac
 sed --i "s@/home/ubuntu@$HOME@g" ./deployment.yaml
 sed --i "s@qemu+ssh://ubuntu@qemu+ssh://$USER@g" ./deployment.yaml
 
-#make sure no password asked during the deployment. 
+#make sure no password asked during the deployment.
 
 echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init
 
@@ -73,9 +76,15 @@ 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 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
+    sudo pip uninstall google-api-python-client
+fi
+
 sudo pip install shyaml
 juju init -f
 
@@ -187,12 +196,8 @@ fi
 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
+        enableautomodebyname eth4 AUTO "10.5.12.0/24" compute || true
+        enableautomodebyname eth4 AUTO "10.5.12.0/24" control || true
         ;;
     'intelpod6' )
         maas refresh
@@ -226,4 +231,3 @@ echo " .... MAAS deployment finished successfully ...."
 
 #echo "... Deployment of opnfv release Started ...."
 #python deploy.py $maas_ip
-