X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2F02-deploybundle.sh;h=647d18b0189f455744170bc637dfb39b26ab9f7e;hb=831c054fd39018b484b229503dcbe392ccd17135;hp=42879bd7971112b70285678f212d60807d5351b7;hpb=5374c788e4f35c8295544e9be10523afcb7a17e7;p=joid.git

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 42879bd7..647d18b0 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -10,20 +10,18 @@ opnfvlab=$3
 opnfvsdn=$4
 opnfvfeature=$5
 opnfvdistro=$6
-
-#copy and download charms
-cp $opnfvsdn/fetch-charms.sh ./fetch-charms.sh
+opnfvmodel=$7
 
 jujuver=`juju --version`
+maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ //'`
 
-#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=''
+if [[ "$opnfvmodel" = "openstack" ]]; then
+    #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.
 check_status() {
@@ -32,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
@@ -45,18 +43,42 @@ check_status() {
     echo "...... deployment finishing ......."
 }
 
-#read the value from deployment.yaml
+#read the value from deployconfig.yaml
+
+PROFILE=maas
+MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //')
+API_SERVERMAAS="http://$MAAS_IP/MAAS/"
+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
+    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 [ -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 [[ "$opnfvmodel" = "openstack" ]]; 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
 
-    workmutiple=`maas maas nodes list | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
+    if [[ "$maasver" > "2" ]]; then
+        workmutiple=`maas maas nodes read | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
+    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;
@@ -64,7 +86,7 @@ if [ -e ./deployment.yaml ]; then
     echo $max
 
     if [ "$max" -lt 4 ];then
-        workmutiple=1.0
+        workmutiple=1.1
     elif [ "$max" -lt 33 ]; then
         workmutiple=0.25
     elif [ "$max" -lt 73 ]; then
@@ -73,6 +95,12 @@ if [ -e ./deployment.yaml ]; then
         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
 
 case "$opnfvlab" in
@@ -96,15 +124,25 @@ for feature in $opnfvfeature; do
     fi
 done
 
-#update source if trusty is target distribution
-var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack
+if [[ "$opnfvmodel" = "openstack" ]]; then
+    #update source if trusty is target distribution
+    var=os-$opnfvsdn-$fea-$opnfvtype"-"$opnfvdistro"_"$openstack
+
+    if [ "$osdomname" != "None" ]; then
+        var=$var"_"publicapi
+    fi
+else
+    var=k8-$opnfvsdn-$fea-baremetal-core
+fi
 
-if [ "$osdomname" != "None" ]; then
-    var=$var"_"publicapi
+if [[ "$opnfvmodel" = "openstack" ]]; then
+    #lets generate the bundle for all target using genBundle.py
+    python genBundle.py  -l deployconfig.yaml  -s $var > bundles.yaml
+else
+    #lets generate the bundle for k8 target using genK8Bundle.py
+    python genK8Bundle.py  -l deployconfig.yaml  -s $var > bundles.yaml
 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