ocl integration draft.

[joid.git] / ci / 01-deploybundle.sh

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 1c3811d..25ee38e 100755 (executable)
--- 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,13 +146,15 @@ case "$6" in
         ;;
 esac
 
-var=os-$4-$fea-$1
-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
+if [ "$osdomname" != "''" ]; then
+    var=os-$4-$fea-$1-publicapi
+else
+    var=os-$4-$fea-$1
 fi
 
+#lets generate the bundle for all target using genBundle.py
+python genBundle.py  -l deployconfig.yaml  -s $var > bundles.yaml
+
 echo "... Deployment Started ...."
     juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
     check_status