X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=0382bb3606084f0a95cffc02536e34224109cdb5;hb=f0bb3fd8968dfbe8c887769d397058752a203431;hp=f9aadaa9378ce30c81ce7bfdce03915bdb7bd50c;hpb=356571b808a65f530b2fbc8de9b042fa06ea2300;p=joid.git diff --git a/ci/deploy.sh b/ci/deploy.sh index f9aadaa9..0382bb36 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -7,10 +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` @@ -24,10 +26,12 @@ usage() { echo "Usage: $0 [-s ] [-t ] [-o ] [-l ] - [-f ] + [-f ] + [-d ] + [-a ] [-r ]" 1>&2 exit 1; } -while getopts ":s:t:o:l:h:r:f:" opt; do +while getopts ":s:t:o:l:h:r:f:d:a:" opt; do case "${opt}" in s) opnfvsdn=${OPTARG} @@ -47,6 +51,12 @@ while getopts ":s:t:o:l:h:r:f:" opt; do f) opnfvfeature=${OPTARG} ;; + d) + opnfvdistro=${OPTARG} + ;; + a) + opnfvarch=${OPTARG} + ;; h) usage ;; @@ -76,15 +86,11 @@ createresource() { 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 - sudo virt-install --connect qemu:///system --name node5-compute --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 node5-compute - node3controlmac=`grep "mac address" node3-control | head -1 | cut -d "'" -f 2` node4controlmac=`grep "mac address" node4-control | head -1 | cut -d "'" -f 2` - node5computemac=`grep "mac address" node5-compute | head -1 | cut -d "'" -f 2` sudo virsh -c qemu:///system define --file node3-control sudo virsh -c qemu:///system define --file node4-control - sudo virsh -c qemu:///system define --file node5-compute 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 ` @@ -94,9 +100,6 @@ createresource() { maas maas tag update-nodes control add=$controlnodeid - computenodeid=`maas maas nodes new autodetect_nodegroup='yes' name='node5-compute' tags='compute' hostname='node5-compute' power_type='virsh' mac_addresses=$node5computemac power_parameters_power_address='qemu+ssh://'$USER'@192.168.122.1/system' architecture='amd64/generic' power_parameters_power_id='node5-compute' | grep system_id | cut -d '"' -f 4 ` - - maas maas tag update-nodes compute add=$computenodeid fi } @@ -109,7 +112,7 @@ 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/ @@ -117,11 +120,11 @@ deploy() { createresource fi - #cp ./$opnfvsdn/01-deploybundle.sh ./01-deploybundle.sh + #bootstrap the node ./00-bootstrap.sh - #case default: - ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature + #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. @@ -130,7 +133,7 @@ check_status() { 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 @@ -141,55 +144,25 @@ check_status() { retval=1 fi done + status=`juju action do heat/0 domain-setup` + echo $status echo "...... deployment finishing ......." } -#create config RC file to consume by various tests. -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 - } - -#to get the address of a service using juju -unitAddress() -{ - juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null -} - -createopenrc() -{ - if [ "$opnfvsdn" == "onos" ]; then - sh onos/juju_test_prepare.sh "$opnfvlab" - check_status - fi - - mkdir -m 0700 -p cloud +echo "...... deployment started ......" +deploy - controller_address=$(unitAddress keystone 0) - configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical - chmod 0600 cloud/admin-openrc -} +#temporary change the user instances as dhcp failed with limitation exceeded. +# to be remove once charm fixes the issue -if [ "$#" -eq 0 ]; then - echo "This installtion will use default options" - #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 ......." - -