X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=0382bb3606084f0a95cffc02536e34224109cdb5;hb=refs%2Fchanges%2F37%2F16237%2F2;hp=97e4a57543b14a3ab1ca37c39293b2c0998effb5;hpb=3f0be8b1190c737aea6a1d1d3108f594a2fb4aa0;p=joid.git diff --git a/ci/deploy.sh b/ci/deploy.sh index 97e4a575..0382bb36 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -7,9 +7,12 @@ set -ex opnfvsdn=nosdn opnfvtype=nonha -openstack=liberty +openstack=mitaka opnfvlab=default -opnfvrel=b +opnfvrel=c +opnfvfeature=odl_l2 +opnfvdistro=xenial +opnfvarch=amd64 read_config() { opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2` @@ -23,9 +26,12 @@ usage() { echo "Usage: $0 [-s ] [-t ] [-o ] [-l ] + [-f ] + [-d ] + [-a ] [-r ]" 1>&2 exit 1; } -while getopts ":s:t:o:l:h:r:" opt; do +while getopts ":s:t:o:l:h:r:f:d:a:" opt; do case "${opt}" in s) opnfvsdn=${OPTARG} @@ -42,6 +48,15 @@ while getopts ":s:t:o:l:h:r:" opt; do r) opnfvrel=${OPTARG} ;; + f) + opnfvfeature=${OPTARG} + ;; + d) + opnfvdistro=${OPTARG} + ;; + a) + opnfvarch=${OPTARG} + ;; h) usage ;; @@ -58,6 +73,38 @@ deploy_dep() { cp environments.yaml ~/.juju/ } +#by default maas creates two VMs in case of three more VM needed. +createresource() { + maas_ip=`grep " ip_address" deployment.yaml | cut -d " " -f 10` + apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2` + maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey} + + nodeexist=`maas maas nodes list hostname=node3-control` + + if [ $nodeexist != *node3* ]; then + sudo virt-install --connect qemu:///system --name node3-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node3-control + + sudo virt-install --connect qemu:///system --name node4-control --ram 8192 --vcpus 4 --disk size=120,format=qcow2,bus=virtio,io=native,pool=default --network bridge=virbr0,model=virtio --network bridge=virbr0,model=virtio --boot network,hd,menu=off --noautoconsole --vnc --print-xml | tee node4-control + + node3controlmac=`grep "mac address" node3-control | head -1 | cut -d "'" -f 2` + node4controlmac=`grep "mac address" node4-control | head -1 | cut -d "'" -f 2` + + sudo virsh -c qemu:///system define --file node3-control + sudo virsh -c qemu:///system define --file node4-control + + controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node3-control' tags='control' hostname='node3-control' power_type='virsh' mac_addresses=$node3controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node3-control' | grep system_id | cut -d '"' -f 4 ` + + maas maas tag update-nodes control add=$controlnodeid + + controlnodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node4-control' tags='control' hostname='node4-control' power_type='virsh' mac_addresses=$node4controlmac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node4-control' | grep system_id | cut -d '"' -f 4 ` + + maas maas tag update-nodes control add=$controlnodeid + + fi +} + +#copy the files and create extra resources needed for HA deployment +# in case of default VM labs. deploy() { #copy the script which needs to get deployed as part of ofnfv release echo "...... deploying now ......" @@ -65,23 +112,28 @@ deploy() { echo " enable-os-refresh-update: false" >> environments.yaml echo " enable-os-upgrade: false" >> environments.yaml echo " admin-secret: admin" >> environments.yaml - echo " default-series: trusty" >> environments.yaml + echo " default-series: $opnfvdistro" >> environments.yaml cp environments.yaml ~/.juju/ - cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh + if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then + createresource + fi + + #bootstrap the node ./00-bootstrap.sh - #case default: - ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab + #case default deploy the opnfv platform: + ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro } +#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 + juju status > status.txt if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then echo " still executing the reltionship within charms ..." if [ $timeoutiter -ge 60 ]; then @@ -92,48 +144,25 @@ check_status() { retval=1 fi done + status=`juju action do heat/0 domain-setup` + echo $status echo "...... deployment finishing ......." } -configOpenrc() -{ - echo " " > ./cloud/admin-openrc - echo "export OS_USERNAME=$1" >> ./cloud/admin-openrc - echo "export OS_PASSWORD=$2" >> ./cloud/admin-openrc - echo "export OS_TENANT_NAME=$3" >> ./cloud/admin-openrc - echo "export OS_AUTH_URL=$4" >> ./cloud/admin-openrc - echo "export OS_REGION_NAME=$5" >> ./cloud/admin-openrc - } - -unitAddress() -{ - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null -} +echo "...... deployment started ......" +deploy -createopenrc() -{ - mkdir -m 0700 -p cloud +#temporary change the user instances as dhcp failed with limitation exceeded. +# to be remove once charm fixes the issue - controller_address=$(unitAddress keystone 0) - configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical - chmod 0600 cloud/admin-openrc -} - -if [ "$#" -eq 0 ]; then - echo "This installtion will use deploy.yaml" - read_config +if [ "$opnfvdistro" == "xenial" ]; then + juju ssh neutron-gateway/0 "echo 512 | sudo tee /proc/sys/fs/inotify/max_user_instances" fi +# Temorary change end -echo "...... deployment started ......" -#deploy_dep -deploy check_status echo "...... deployment finished ......." -echo "...... creating OpenRc file for consuming by various user ......." - -createopenrc +./openstack.sh "$opnfvsdn" echo "...... finished ......." - -