From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Tue, 23 Aug 2016 04:34:55 +0000 (-0500)
Subject: added lab to compare currently run only for orange pod1
X-Git-Tag: colorado.1.0~14
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d20a00bf3e5f884db7d5e64ccc481ac17e795e00;p=joid.git

added lab to compare currently run only for orange pod1

Change-Id: I9f3689b65ca01ed74a39c9592221b1385ecbc4cd
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
(cherry picked from commit b52bd11144452da1df96dc6a65210ebfd9e24111)
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index c9994cca..dbe0ef97 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -170,7 +170,7 @@ check_status
 
 echo "...... deployment finished  ......."
 
-./openstack.sh "$opnfvsdn" "$opnfvdistro" "$openstack" || true
+./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
 sudo ../juju/get-cloud-images || true
 ../juju/joid-configure-openstack || true
 
diff --git a/ci/openstack.sh b/ci/openstack.sh
index fbfc7c06..2e1eb9e1 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -7,11 +7,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-#./openstack.sh "$opnfvsdn" "$opnfvdistro" "$openstack"
+#./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
 
 opnfvsdn=$1
-opnfvdistro=$2
-opnfvos=$3
+opnfvlab=$2
+opnfvdistro=$3
+opnfvos=$4
 
 if [ -f ./deployconfig.yaml ];then
     EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `