From 62781fc5a43f756f00841cebe0b89d2a9d349ede Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 1 Jul 2016 09:02:24 -0500 Subject: modified to integrete ONOS. Change-Id: Ic787c583c36805aca13ec0a954b23d89a1addc8d Signed-off-by: Narinder Gupta --- ci/01-deploybundle.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'ci/01-deploybundle.sh') diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh index 1c3811dc..78f3cf50 100755 --- a/ci/01-deploybundle.sh +++ b/ci/01-deploybundle.sh @@ -10,6 +10,8 @@ set -ex sed -i -- "s|distro=trusty|distro=$6|g" ./fetch-charms.sh ./fetch-charms.sh $6 +osdomname='' + case "$1" in 'nonha' ) cp $4/juju-deployer/ovs-$4-nonha.yaml ./bundles.yaml @@ -144,11 +146,18 @@ case "$6" in ;; esac -var=os-$4-$fea-$1 -if [ "$4" == "nosdn" ]; then +if [ "$osdomname" != "''" ]; then + var=os-$4-$fea-$1-publicapi +else + var=os-$4-$fea-$1 +fi + +if [ "$4" != "nosdn" ]; then python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml elif [ "$4" == "odl" ]; then python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml +elif [ "$4" == "onos" ]; then + python genBundle.py -l deployconfig.yaml -s $var > bundles.yaml fi echo "... Deployment Started ...." -- cgit 1.2.3-korg