opnfvdistro=$6
opnfvmodel=$7
-jujuver=`juju --version`
-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
#check whether charms are still executing the code even juju-deployer says installed.
check_status() {
+ waitstatus=$1
+ waittime=$2
retval=0
timeoutiter=0
+
+ echo -n "executing the reltionship within charms ."
while [ $retval -eq 0 ]; do
- sleep 30
- juju status > status.txt
- if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then
- echo " still waiting for machines ..."
- if [ $timeoutiter -ge 240 ]; then
+ if juju status | grep -q $waitstatus; then
+ echo -n '.'
+ if [ $timeoutiter -ge $waittime ]; then
+ echo 'timed out'
retval=1
+ else
+ sleep 30
fi
timeoutiter=$((timeoutiter+1))
else
+ echo 'done'
retval=1
fi
done
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
-
+API_SERVERMAAS="http://$MAAS_IP:5240/MAAS/"
+API_KEY=`sudo maas-region apikey --username=ubuntu || true`
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
+ API_KEY=`sshpass -p ubuntu ssh ubuntu@$MAAS_IP 'sudo maas-region apikey --username=ubuntu'`
fi
maas login $PROFILE $API_SERVERMAAS $API_KEY
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/ //'`
+ admnet=`grep "admNetwork" deployconfig.yaml | cut -d ' ' -f 4 | 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 ',' ' '`
- else
- workmutiple=`maas maas nodes list | grep "cpu_count" | cut -d ':' -f 2 | sed -e 's/ //' | tr ',' ' '`
- fi
+ 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;
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
+else
+ cephdisk=`grep "ceph-disk" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //'`
fi
case "$opnfvlab" in
;;
esac
-# lets put the if seperateor as "," as this will save me from world.
+# lets put the if separator as "," as this will save me from world.
fea=""
IFS=","
for feature in $opnfvfeature; do
#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
#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 720
+check_status allocating 220
- 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
+# 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
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
+ TAG="ubuntu16.04-4.1.1.0-103.tar.gz"
+
+ for ROLE in contrail-controller contrail-analytics contrail-analyticsdb
+ do
+ FILE="${ROLE}-${TAG}"
+ if [ ! -f $FILE ]
+ then
+ curl -o $FILE http://artifacts.opnfv.org/ovno/containers/$FILE
+ fi
+ juju attach $ROLE ${ROLE}="./$FILE"
+done
+fi
#lets gather the status of deployment once juju-deployer completed.
juju status --format=tabular
Code Review / joid.git / blobdiff