modified to change the logic to create fabric and vlan if not

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

diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index 7ac224a..647d18b 100755 (executable)
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -18,7 +18,6 @@ maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ /
 if [[ "$opnfvmodel" = "openstack" ]]; then
     #copy and download charms
     ./$opnfvsdn/fetch-charms.sh $opnfvdistro
-    tar xvf common/scaleio.tar -C ./$opnfvdistro/ --strip=2 juju-scaleio/trusty/
     osdomname=''
 else
     ./kubernetes/fetch-charms.sh $opnfvdistro
@@ -31,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
@@ -96,6 +95,12 @@ if [[ "$opnfvmodel" = "openstack" ]]; 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