X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-deploybundle.sh;h=396f5ea9924654ee8a9930408b5288a466d3f231;hb=95e07c1f1ab9ee6322998ba429e104853f39577e;hp=bc2748197f313fbab3f485094d802133b942c58f;hpb=e4e0ab5bdd9a0be1398fa18bcd67dad8e39919c3;p=joid.git

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index bc274819..396f5ea9 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -33,7 +33,7 @@ check_status() {
     while [ $retval -eq 0 ]; do
         if juju status | grep -q $waitstatus; then
            echo -n '.'
-           if [ $timeoutiter -ge 240 ]; then
+           if [ $timeoutiter -ge 180 ]; then
                echo 'timed out'
                retval=1
            else
@@ -133,9 +133,6 @@ if [[ "$opnfvmodel" = "openstack" ]]; then
     #update source if trusty is target distribution
     var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack
 
-    if ([ $osdomname ] && [ $osdomname != "null" ] && [ $osdomname != "None"]); then
-        var=$var"_"publicapi
-    fi
 else
     var=k8-$opnfvsdn-$fea-baremetal-core
 fi
@@ -151,25 +148,13 @@ fi
 #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
+# with JUJU 2.0 bundles has to be deployed only once.
+juju deploy bundles.yaml --debug
+sleep 120
+check_status allocating
 
-    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 allocating
+# need to revisit later if not needed we will remove the below.
+openfile_fix() {
     # seeing issue related to number of open files.
     count=`juju status nodes --format=short | grep nodes | wc -l`
     c=0
@@ -180,14 +165,13 @@ else
         juju ssh nodes-compute/$c 'echo 2048 | sudo tee /proc/sys/fs/inotify/max_user_instances' || true
         let c+=1
     done
-fi
+}
 
 if [ "$opnfvsdn" = "ocl" ]
 then
-  ROLES="contrail-controller contrail-analytics contrail-analyticsdb"
   TAG="ubuntu16.04-4.0.0.0-20.tar.gz"
 
-  for ROLE in $ROLES
+  for ROLE in contrail-controller contrail-analytics contrail-analyticsdb
   do
     FILE="${ROLE}-${TAG}"
   if [ ! -f $FILE ]