trying different option as delpoyment failed.

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

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index 404dc21..e53f3f5 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
@@ -27,6 +29,25 @@ case "$1" in
         ;;
 esac
 
+#check whether charms are still executing the code even juju-deployer says installed.
+check_status() {
+    retval=0
+    timeoutiter=0
+    while [ $retval -eq 0 ]; do
+       sleep 30
+       juju status > status.txt
+       if [ "$(grep -c "executing" status.txt )" -ge 2 ]; then
+           echo " still executing the reltionship within charms ..."
+           if [ $timeoutiter -ge 60 ]; then
+               retval=1
+           fi
+           timeoutiter=$((timeoutiter+1))
+       else
+           retval=1
+       fi
+    done
+    echo "...... deployment finishing ......."
+}
 
 #read the value from deployment.yaml
 if [ -e ~/.juju/deployment.yaml ]; then
@@ -41,8 +62,15 @@ 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
    fi
 fi
 
@@ -61,9 +89,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
@@ -111,9 +144,18 @@ case "$6" in
         ;;
 esac
 
-echo "... Deployment Started ...."
-    juju-deployer -vW -d -t 3600 -c bundles.yaml $6-"$2"-nodes
+if [ "$osdomname" != "''" ]; then
+    var=os-$4-$fea-$1-publicapi
+else
+    var=os-$4-$fea-$1
+fi
 
-    juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
+#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 7200 -r 5 -c bundles.yaml $6-"$2"-nodes
+    juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
+    juju ssh nodes/1 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
     juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"
+    #check_status