X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-deploybundle.sh;h=f51ebe2685cf5ca233e9b1026adad9a2878c43dc;hb=157b0b2fc55920773a02146660ca5b7eb78a910f;hp=22d44970e8004fe66daa84f341d12210c80d3a67;hpb=18ac5bcf2be8d8bdbfd5066ef25d57c3c36725e1;p=joid.git

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 22d44970..f51ebe26 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -14,11 +14,15 @@ opnfvdistro=$6
 #copy and download charms
 cp $opnfvsdn/fetch-charms.sh ./fetch-charms.sh
 
+jujuver=`juju --version`
+
 #modify the ubuntu series wants to deploy
 sed -i -- "s|distro=trusty|distro=$opnfvdistro|g" ./fetch-charms.sh
 
 ./fetch-charms.sh $opnfvdistro
 
+tar xvf common/scaleio.tar -C ./$opnfvdistro/ --strip=2 juju-scaleio/trusty/
+
 osdomname=''
 
 #check whether charms are still executing the code even juju-deployer says installed.
@@ -28,9 +32,9 @@ check_status() {
     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
+       if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then
+           echo " still waiting for machines ..."
+           if [ $timeoutiter -ge 360 ]; then
                retval=1
            fi
            timeoutiter=$((timeoutiter+1))
@@ -42,10 +46,9 @@ check_status() {
 }
 
 #read the value from deployment.yaml
-if [ -e ~/.juju/deployment.yaml ]; then
-   cp ~/.juju/deployment.yaml ./deployment.yaml
-   if [ -e ~/.juju/deployconfig.yaml ]; then
-      cp ~/.juju/deployconfig.yaml ./deployconfig.yaml
+
+if [ -e ./deployment.yaml ]; then
+   if [ -e ./deployconfig.yaml ]; then
       extport=`grep "ext-port" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //' | tr ',' ' '`
       datanet=`grep "dataNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
       admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | sed -e 's/ //'`
@@ -60,16 +63,16 @@ if [ -e ~/.juju/deployment.yaml ]; then
     done
     echo $max
 
-    if [ "$max" -lt 8 ];then
-        workmutiple=1
-    elif [ "$max" -lt 32 ]; then
+    if [ "$max" -lt 4 ];then
+        workmutiple=1.0
+    elif [ "$max" -lt 33 ]; then
         workmutiple=0.25
-    elif [ "$max" -lt 72 ]; then
+    elif [ "$max" -lt 73 ]; then
         workmutiple=0.1
     else
         workmutiple=0.05
     fi
-    sed -i "s/worker-multiplier: 2/worker-multiplier: ${workmutiple}/g" default_deployment_config.yaml
+    sed -i "s/worker_multiplier: 1.0/worker_multiplier: ${workmutiple}/g" default_deployment_config.yaml
 fi
 
 case "$opnfvlab" in
@@ -102,19 +105,39 @@ fi
 
 #lets generate the bundle for all target using genBundle.py
 python genBundle.py  -l deployconfig.yaml  -s $var > bundles.yaml
+#keep the back in cloud for later debugging.
+pastebinit bundles.yaml || true
+
+if [[ "$jujuver" < "2" ]]; then
+    echo "... Deployment Started ...."
+    juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack"-nodes
+    count=`juju status nodes --format=short | grep nodes | wc -l`
+    c=0
+    while [ $c -lt $count ]; do
+        juju ssh nodes/$c 'echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p' || true
+        juju ssh nodes-compute/$c 'echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p' || true
+        juju ssh nodes/$c 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances' || true
+        juju ssh nodes-compute/$c 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances' || true
+        let c+=1
+    done
 
-echo "... Deployment Started ...."
-juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack"-nodes
-
-# seeing issue related to number of open files.
-# juju run --service nodes 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances'
-
-count=`juju status nodes --format=short | grep nodes | wc -l`
-
-c=0
-while [ $c -lt $count ]; do
-    juju ssh nodes/$c 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances'
-    let c+=1
-done
+    juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack" || true
+else
+    # with JUJU 2.0 bundles has to be deployed only once.
+    juju deploy bundles.yaml --debug
+    sleep 120
+    check_status
+    # seeing issue related to number of open files.
+    count=`juju status nodes --format=short | grep nodes | wc -l`
+    c=0
+    while [ $c -lt $count ]; do
+        juju ssh nodes/$c 'echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p' || true
+        juju ssh nodes-compute/$c 'echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p' || true
+        juju ssh nodes/$c 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances' || true
+        juju ssh nodes-compute/$c 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances' || true
+        let c+=1
+    done
+fi
 
-juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$openstack" || true
+#lets gather the status of deployment once juju-deployer completed.
+juju status --format=tabular