From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 22 Aug 2016 22:59:19 +0000 (-0500)
Subject: trying to pass correct target for deployment.
X-Git-Tag: colorado.1.0~15
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1db0461e27fec9f264faa251c428c1eca66e2dba;p=joid.git

trying to pass correct target for deployment.

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

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 8692df68..c9994cca 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -170,7 +170,7 @@ check_status
 
 echo "...... deployment finished  ......."
 
-./openstack.sh "$opnfvsdn" "$opnfvlab" || true
+./openstack.sh "$opnfvsdn" "$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 a76785bf..fbfc7c06 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -7,8 +7,11 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-opnfvlab=$2
+#./openstack.sh "$opnfvsdn" "$opnfvdistro" "$openstack"
+
 opnfvsdn=$1
+opnfvdistro=$2
+opnfvos=$3
 
 if [ -f ./deployconfig.yaml ];then
     EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
@@ -134,7 +137,7 @@ if [ "$opnfvlab" == "orangepod1" ] && [ "$opnfvsdn" == "nosdn" ]; then # only fo
         juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_NET} dev br-ex" || true
         juju run --unit nodes/0 "sudo ip l set dev br-ex up" || true
         python genPublicAPIProxyBundle.py -l labconfig.yaml >> bundles.yaml
-        juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack" || true
+        juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$opnfvos" || true
     fi
 fi