X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F01-deploybundle.sh;h=25ee38e0c55a9a60985ca9cb58a77c32972674f8;hb=628346cfd690524f1ec455ca35c3bc7474640079;hp=08f539b52d44b4609f111c517a56d0ba233d8c3b;hpb=d545ddc8b29d7d86ce160805449087ede0544b41;p=joid.git

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 08f539b5..25ee38e0 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
@@ -62,7 +64,7 @@ if [ -e ~/.juju/deployment.yaml ]; then
       fi
       admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
       sed --i "s@10.4.1.1@$admnet@g" ./bundles.yaml
-      cephdisk=`grep "disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+      cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
       sed --i "s@osd-devices: /srv@osd-devices: $cephdisk@g" ./bundles.yaml
       osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
       if [ "$osdomname" != "''" ]; then
@@ -89,9 +91,14 @@ case "$3" in
 esac
 
 # lets put the if seperateor as "," as this will save me from world.
+fea=""
 IFS=","
-
 for feature in $5; do
+    if [ "$fea" == "" ]; then
+        fea=$feature
+    else
+        fea=$fea"_"$feature
+    fi
     case "$feature" in
         'ipv6' )
              sed -i -- 's/#prefer-ipv6: true/prefer-ipv6: true/g' ./bundles.yaml
@@ -139,6 +146,15 @@ case "$6" in
         ;;
 esac
 
+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