X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F01-deploybundle.sh;h=78f3cf508c397cd38d8035c3329fd983e6d8b939;hb=62781fc5a43f756f00841cebe0b89d2a9d349ede;hp=7748b005930530811f846594b508df01c458027a;hpb=403471e3dae07ac8a791006d1edcd4d885d17bf2;p=joid.git

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 7748b005..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
@@ -62,10 +64,12 @@ 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
+          sed --i "s@#use-internal-endpoints: true@use-internal-endpoints: true@g" ./bundles.yaml
+          sed --i "s@#endpoint-type: internalURL@endpoint-type: internalURL@g" ./bundles.yaml
           sed --i "s@#os-public-hostname: pod.maas@os-public-hostname: api.$osdomname@g" ./bundles.yaml
           sed --i "s@#console-proxy-ip: pod.maas@console-proxy-ip: $osdomname@g" ./bundles.yaml
       fi
@@ -87,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
@@ -137,6 +146,20 @@ case "$6" in
         ;;
 esac
 
+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 ...."
     juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
     check_status