summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-08-22 17:59:19 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-08-23 22:47:11 +0000
commit1db0461e27fec9f264faa251c428c1eca66e2dba (patch)
tree5c96b32d9672567738bb2ed8a28746da9194d6c3 /ci
parentf6b2dff52fd9440aa0f41122992501f36ecaedcf (diff)
trying to pass correct target for deployment.
Change-Id: I76ee4d723b86a9d4538cb7137bd3cbe1ba8303ed Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com> (cherry picked from commit 16203a70bf3cca4dd48e1d14a506f3cf7b9a26ba)
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh2
-rwxr-xr-xci/openstack.sh7
2 files changed, 6 insertions, 3 deletions
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