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

diff --git a/ci/01-deploybundle.sh b/ci/01-deploybundle.sh
index bf9784f4..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
@@ -27,6 +29,27 @@ 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
+    status=`juju action do heat/0 domain-setup`
+    echo $status
+    echo "...... deployment finishing ......."
+}
 
 #read the value from deployment.yaml
 if [ -e ~/.juju/deployment.yaml ]; then
@@ -41,22 +64,19 @@ 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
 
 case "$3" in
-     'cengnlynxpod1' )
-        # Chose the hard drive(s) to use for CEPH OSD
-         sed -i -- 's|osd-devices: /srv|osd-devices: /dev/sdb|g' ./bundles.yaml
-        # As per your lab vip address list be deafult uses 10.4.1.11 - 10.4.1.20
-         sed -i -- 's/10.4.1.1/10.120.0.1/g' ./bundles.yaml
-        # choose the correct interface to use for data network
-         sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 172.16.121.0\/24/g' ./bundles.yaml
-        # Choose the external port to go out from gateway to use.
-         sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1.1202"/g' ./bundles.yaml
-        ;;
      'juniperpod1' )
          sed -i -- 's/10.4.1.1/172.16.50.1/g' ./bundles.yaml
          sed -i -- 's/#ext-port: "eth1"/ext-port: "eth1"/g' ./bundles.yaml
@@ -71,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
@@ -113,6 +138,7 @@ sed -i -- "s|mitaka|$2|g" ./bundles.yaml
 case "$6" in
     'trusty' )
         sed -i -- "s|#source|source|g" ./bundles.yaml
+        sed -i -- "s|#source-branch:|source-branch:|g" ./bundles.yaml
         ;;
     'xenial' )
         #changing the target to the ubuntu distro we want to deploy.
@@ -120,6 +146,24 @@ 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
+
+    juju ssh nodes/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances"
+
     juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $6-"$2"