X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=3bbddb6fd78a8e3440f0672175ae4126731a2d33;hb=HEAD;hp=3985896e1fe192414ac6e046ef5df78ef71a8d84;hpb=22a84bad2e15472fe3ea181aca35e7c48afb054f;p=joid.git diff --git a/ci/deploy.sh b/ci/deploy.sh index 3985896e..3bbddb6f 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -2,14 +2,14 @@ set -ex -source tools.sh +source common/tools.sh #need to put multiple cases here where decide this bundle to deploy by default use the odl bundle. # Below parameters are the default and we can according the release opnfvsdn=nosdn opnfvtype=noha -openstack=ocata +openstack=queens opnfvlab=default opnfvlabfile= opnfvrel=e @@ -20,20 +20,18 @@ opnfvmodel=openstack virtinstall=0 maasinstall=0 -jujuver=`juju --version` - usage() { echo "Usage: $0 - [-s|--sdn ] + [-s|--sdn ] [-t|--type ] - [-o|--openstack ] + [-o|--openstack ] [-l|--lab ] - [-f|--feature ] + [-f|--feature ] [-d|--distro ] [-a|--arch ] [-m|--model ] [-i|--virtinstall <0|1>] [--maasinstall <0|1>] - [--labfile ] + [--labfile ] [-r|--release ]" 1>&2 exit 1; } @@ -92,7 +90,7 @@ for argument in $options -d|--distro ) if ([ "arguments[index]" != "" ]); then - opnfdistro=${arguments[index]} + opnfvdistro=${arguments[index]} fi; ;; @@ -136,6 +134,17 @@ createresource() { API_KEY=`sudo maas-region apikey --username=ubuntu` maas login $PROFILE $API_SERVER $API_KEY + # if we have a virshurl configuration we use it, else we use local + VIRSHURL=$(cat labconfig.json | jq -r '.opnfv.virshurl') + if ([ $VIRSHURL == "" ] || [ "$VIRSHURL" == "null" ]); then + VIRSHIP=$MAAS_IP + VIRSHURL="qemu+ssh://$USER@$VIRSHIP/system " + VIRSHHOST="" + else + VIRSHHOST=$(echo $VIRSHURL| cut -d\/ -f 3 | cut -d@ -f2) + VIRSHIP="" # TODO: parse from $VIRSHURL if needed + fi + for node in node3-control node4-control do node_id=$(maas $PROFILE machines read | \ @@ -149,7 +158,7 @@ createresource() { --boot network,hd,menu=off \ --noautoconsole --vnc --print-xml | tee _node.xml node_mac=$(grep "mac address" _node.xml | head -1 | cut -d "'" -f 2) - sudo virsh -c qemu:///system define --file _node.xml + sudo virsh -c $VIRSHURL define --file _node.xml rm -f _node.xml maas $PROFILE nodes new autodetect_nodegroup='yes' name=$node \ @@ -157,6 +166,7 @@ createresource() { mac_addresses=$node3controlmac \ power_parameters_power_address="qemu+ssh://$USER@192.168.122.1/system" \ architecture='amd64/generic' power_parameters_power_id='node3-control' + sudo virsh -c $VIRSHURL autostart $node node_id=$(maas $PROFILE machines read | \ jq -r ".[] | select(.hostname == \"$node\").system_id") fi @@ -187,14 +197,14 @@ deploy() { python genDeploymentConfig.py -l labconfig.yaml > deployconfig.yaml fi else - echo_error "MAAS not deployed please deploy MAAS first." + if [ "$maasinstall" -eq 0 ]; then + echo_error "MAAS not deployed please deploy MAAS first." + else + echo_info "MAAS not deployed this will deploy MAAS first." + fi fi fi - #create json file which is missing in case of new deployment after maas and git tree cloned freshly. - python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < labconfig.yaml > labconfig.json - python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < deployconfig.yaml > deployconfig.json - # Install MAAS and expecting the labconfig.yaml at local directory. if [ "$maasinstall" -eq 1 ]; then @@ -202,20 +212,22 @@ deploy() { PROFILE=${PROFILE:-ubuntu} MAAS_IP=$(grep " ip_address" deployconfig.yaml | cut -d ':' -f 2 | sed -e 's/ //') API_SERVER="http://$MAAS_IP:5240/MAAS/api/2.0" - API_KEY=`sudo maas-region apikey --username=ubuntu` - maas login $PROFILE $API_SERVER $API_KEY - - # make sure there is no machine entry in maas - for m in $(maas $PROFILE machines read | jq -r '.[].system_id') - do - maas $PROFILE machine delete $m || true - done - maas $PROFILE pod delete 1 || true - + if which maas > /dev/null; then + API_KEY=`sudo maas-region apikey --username=ubuntu` + maas login $PROFILE $API_SERVER $API_KEY + + # make sure there is no machine entry in maas + for m in $(maas $PROFILE machines read | jq -r '.[].system_id') + do + maas $PROFILE machine delete $m || true + done + podno=$(maas $PROFILE pods read | jq -r ".[]".id) + maas $PROFILE pod delete $podno || true + fi ./cleanvm.sh || true if [ "$virtinstall" -eq 1 ]; then - ./00-maasdeploy.sh virtual + ./03-maasdeploy.sh virtual else if [ -z "$labfile" ]; then if [ ! -e ./labconfig.yaml ]; then @@ -236,18 +248,23 @@ deploy() { cp $labfile ./labconfig.yaml fi - ./00-maasdeploy.sh custom + ./03-maasdeploy.sh custom fi fi + #create json file which is missing in case of new deployment after maas and git tree cloned freshly. + python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < labconfig.yaml > labconfig.json + python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < deployconfig.yaml > deployconfig.json + if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then createresource fi #bootstrap the node - ./01-bootstrap.sh + ./01-bootstrap.sh $opnfvdistro juju model-config default-series=$opnfvdistro enable-os-refresh-update=false enable-os-upgrade=false + juju set-model-constraints tags= # case default deploy the opnfv platform: ./02-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro $opnfvmodel @@ -256,6 +273,7 @@ deploy() { #check whether charms are still executing the code even juju-deployer says installed. check_status() { waitstatus=$1 + waittime=$2 retval=0 timeoutiter=0 @@ -263,7 +281,7 @@ check_status() { while [ $retval -eq 0 ]; do if juju status | grep -q $waitstatus; then echo_info "Still waiting for $waitstatus units" - if [ $timeoutiter -ge 180 ]; then + if [ $timeoutiter -ge $waittime ]; then echo_error 'Timed out' retval=1 else @@ -293,53 +311,40 @@ fi echo_info "Deployment started" deploy -check_status executing +check_status executing 180 echo_info "Deployment finished" - -echo_info "Configuring public access" +juju status --format=tabular # translate bundle.yaml to json python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < bundles.yaml > bundles.json -public_service() { - # get services list having a public interface - srv_list=$(cat bundles.json | jq -r ".services | to_entries[] | {\"key\": .key, \"value\": .value[\"bindings\"]} | select (.value!=null) | select(.value[] | contains(\"public-api\"))".key) - # get cnt list from service list - cnt_list=$(for cnt in $srv_list; do juju status $cnt --format=json | jq -r ".machines[].containers | to_entries[]".key; done) - # get public network gateway (supposing it is the first ip of the network) - public_api_gw=$(cat labconfig.json | jq --raw-output ".opnfv.spaces[] | select(.type==\"public\")".gateway) - admin_gw=$(cat labconfig.json | jq --raw-output ".opnfv.spaces[] | select(.type==\"admin\")".gateway) - - if ([ $admin_gw ] && [ $admin_gw != "null" ]); then - # set default gateway to public api gateway - for cnt in $cnt_list; do - echo_info "Changing default gateway on $cnt" - if ([ $public_api_gw ] && [ $public_api_gw != "null" ]); then - juju ssh $cnt "sudo ip r d default && sudo ip r a default via $public_api_gw"; - juju ssh $cnt "gw_dev=\$(ip r l | grep 'via $public_api_gw' | cut -d \ -f5) &&\ - sudo cp /etc/network/interfaces /etc/network/interfaces.bak &&\ - echo 'removing old default gateway' &&\ - sudo perl -i -pe 's/^\ *gateway $admin_gw\n$//' /etc/network/interfaces &&\ - sudo perl -i -pe \"s/iface \$gw_dev inet static/iface \$gw_dev inet static\\n gateway $public_api_gw/\" /etc/network/interfaces \ - "; - fi - done - fi -} - # Configuring deployment if ([ $opnfvmodel == "openstack" ]); then + echo_info "Configuring OpenStack deployment" ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true # creating heat domain after pushing the public API into /etc/hosts - if [[ "$jujuver" > "2" ]]; then - status=`juju run-action heat/0 domain-setup` + status=`juju run-action heat/0 domain-setup` + echo $status + if ([ $opnfvsdn != "ocl" ]) then + status=`juju run-action ceilometer/0 ceilometer-upgrade` + fi + echo $status + if ([ $opnftype == "ha" ]); then + status=`juju run-action heat/1 domain-setup` echo $status - else - status=`juju action do heat/0 domain-setup` + if ([ $opnfvsdn != "ocl" ]) then + status=`juju run-action ceilometer/1 ceilometer-upgrade` + fi + echo $status + status=`juju run-action heat/2 domain-setup` + echo $status + if ([ $opnfvsdn != "ocl" ]) then + status=`juju run-action ceilometer/2 ceilometer-upgrade` + fi echo $status fi @@ -351,9 +356,12 @@ if ([ $opnfvmodel == "openstack" ]); then fi elif ([ $opnfvmodel == "kubernetes" ]); then + #Workarounf for master chanrm as it takes 5 minutes to run properly + check_status waiting 50 + check_status executing 50 echo_info "Configuring Kubernetes deployment" - ./k8.sh + ./k8.sh $opnfvfeature fi # expose the juju gui-url to login into juju gui