Merge "adding new scenraio documentation and updated the current one."

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

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 1bb8e35..647d18b 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -12,23 +12,15 @@ opnfvfeature=$5
 opnfvdistro=$6
 opnfvmodel=$7
 
-if [[ "$opnfvmodel" = "openstack" ]]; then
-    #copy and download charms
-    cp $opnfvsdn/fetch-charms.sh ./fetch-charms.sh
-else
-    cp kubernetes/fetch-charms.sh ./fetch-charms.sh
-fi
-
 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
+maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ //'`
 
 if [[ "$opnfvmodel" = "openstack" ]]; then
-    tar xvf common/scaleio.tar -C ./$opnfvdistro/ --strip=2 juju-scaleio/trusty/
+    #copy and download charms
+    ./$opnfvsdn/fetch-charms.sh $opnfvdistro
     osdomname=''
+else
+    ./kubernetes/fetch-charms.sh $opnfvdistro
 fi
 
 #check whether charms are still executing the code even juju-deployer says installed.
@@ -38,7 +30,7 @@ check_status() {
     while [ $retval -eq 0 ]; do
        sleep 30
        juju status > status.txt
-       if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then
+       if [ "$(grep -c "waiting" status.txt )" -ge 2 ]; then
            echo " still waiting for machines ..."
            if [ $timeoutiter -ge 240 ]; then
                retval=1
@@ -51,46 +43,63 @@ check_status() {
     echo "...... deployment finishing ......."
 }
 
-#read the value from deployment.yaml
+#read the value from deployconfig.yaml
 
 PROFILE=maas
-MAAS_IP=$(grep " ip_address" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //')
+MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //')
 API_SERVERMAAS="http://$MAAS_IP/MAAS/"
-API_KEY=`sudo maas-region apikey --username=ubuntu || true`
+if [[ "$maasver" > "2" ]]; then
+    API_KEY=`sudo maas-region apikey --username=ubuntu || true`
+else
+    API_KEY=`sudo maas-region-admin apikey --username=ubuntu || true`
+fi
+
 
 if [[ "$API_KEY" = "" ]]; then
-    API_KEY=`sshpass -p ubuntu ssh ubuntu@$MAAS_IP 'sudo maas-region apikey --username=ubuntu'`
+    if [[ "$maasver" > "2" ]]; then
+        API_KEY=`sshpass -p ubuntu ssh ubuntu@$MAAS_IP 'sudo maas-region apikey --username=ubuntu'`
+    else
+        API_KEY=`sshpass -p ubuntu ssh ubuntu@$MAAS_IP 'sudo maas-region-admin apikey --username=ubuntu'`
+    fi
 fi
 
 maas login $PROFILE $API_SERVERMAAS $API_KEY
 
 if [[ "$opnfvmodel" = "openstack" ]]; then
-    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/ //'`
-          cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
-          osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
-       fi
+    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/ //'`
+       cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+       osdomname=`grep "os-domain-name" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
+    fi
 
+    if [[ "$maasver" > "2" ]]; then
         workmutiple=`maas maas nodes read | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
-        max=0
-        for v in ${workmutiple[@]}; do
-            if (( $v > $max )); then max=$v; fi;
-        done
-        echo $max
-
-        if [ "$max" -lt 4 ];then
-            workmutiple=1.1
-        elif [ "$max" -lt 33 ]; then
-            workmutiple=0.25
-        elif [ "$max" -lt 73 ]; then
-            workmutiple=0.1
-        else
-            workmutiple=0.05
-        fi
-        sed -i "s/worker_multiplier: 1.0/worker_multiplier: ${workmutiple}/g" default_deployment_config.yaml
+    else
+        workmutiple=`maas maas nodes list | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
+    fi
+    max=0
+    for v in ${workmutiple[@]}; do
+        if (( $v > $max )); then max=$v; fi;
+    done
+    echo $max
+
+    if [ "$max" -lt 4 ];then
+        workmutiple=1.1
+    elif [ "$max" -lt 33 ]; then
+        workmutiple=0.25
+    elif [ "$max" -lt 73 ]; then
+        workmutiple=0.1
+    else
+        workmutiple=0.05
+    fi
+    sed -i "s/worker_multiplier: 1.0/worker_multiplier: ${workmutiple}/g" default_deployment_config.yaml
+
+    if [ "$opnfvlab" != "default" ]; then
+        sed -i "s/cpu_pin_set: all/cpu_pin_set: 2-${max},^${max}/g" default_deployment_config.yaml
+    else
+        sed -i "s/cpu_pin_set: all/cpu_pin_set: 1/g" default_deployment_config.yaml
     fi
 fi