X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fdeploy.sh;h=9d24d2f8fd21a708ca993865950e4b1245ea0c9c;hb=512a3b283ff25cad16a36605c80df4742673690b;hp=48c0d6e6821675f6e626e293ff0074987d0e47d8;hpb=d2d6923d759fbed5ad5147c95f9cb9f9051c8b11;p=joid.git diff --git a/ci/deploy.sh b/ci/deploy.sh index 48c0d6e6..9d24d2f8 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -13,6 +13,9 @@ opnfvrel=c opnfvfeature=none opnfvdistro=xenial opnfvarch=amd64 +opnfvmodel=openstack + +jujuver=`juju --version` read_config() { opnfvrel=`grep release: deploy.yaml | cut -d ":" -f2` @@ -29,9 +32,10 @@ usage() { echo "Usage: $0 [-s ] [-f ] [-d ] [-a ] + [-m ] [-r ]" 1>&2 exit 1; } -while getopts ":s:t:o:l:h:r:f:d:a:" opt; do +while getopts ":s:t:o:l:h:r:f:d:a:m:" opt; do case "${opt}" in s) opnfvsdn=${OPTARG} @@ -57,6 +61,9 @@ while getopts ":s:t:o:l:h:r:f:d:a:" opt; do a) opnfvarch=${OPTARG} ;; + m) + opnfvmodel=${OPTARG} + ;; h) usage ;; @@ -65,14 +72,6 @@ while getopts ":s:t:o:l:h:r:f:d:a:" opt; do esac done -deploy_dep() { - sudo apt-add-repository ppa:juju/stable -y - sudo apt-get update - sudo apt-get install juju git juju-deployer -y - juju init -f - 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` @@ -82,9 +81,9 @@ createresource() { 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 node3-control --ram 8192 --cpu host --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 + sudo virt-install --connect qemu:///system --name node4-control --ram 8192 --cpu host --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` @@ -109,15 +108,23 @@ deploy() { if [ ! -f ./environments.yaml ] && [ -e ~/.juju/environments.yaml ]; then cp ~/.juju/environments.yaml ./environments.yaml + elif [ ! -f ./environments.yaml ] && [ -e ~/joid_config/environments.yaml ]; then + cp ~/joid_config/environments.yaml ./environments.yaml fi if [ ! -f ./deployment.yaml ] && [ -e ~/.juju/deployment.yaml ]; then cp ~/.juju/deployment.yaml ./deployment.yaml + elif [ ! -f ./deployment.yaml ] && [ -e ~/joid_config/deployment.yaml ]; then + cp ~/joid_config/deployment.yaml ./deployment.yaml fi if [ ! -f ./labconfig.yaml ] && [ -e ~/.juju/labconfig.yaml ]; then cp ~/.juju/labconfig.yaml ./labconfig.yaml + elif [ ! -f ./labconfig.yaml ] && [ -e ~/joid_config/labconfig.yaml ]; then + cp ~/joid_config/labconfig.yaml ./labconfig.yaml fi if [ ! -f ./deployconfig.yaml ] && [ -e ~/.juju/deployconfig.yaml ]; then cp ~/.juju/deployconfig.yaml ./deployconfig.yaml + elif [ ! -f ./deployconfig.yaml ] && [ -e ~/joid_config/deployconfig.yaml ]; then + cp ~/joid_config/deployconfig.yaml ./deployconfig.yaml fi #copy the script which needs to get deployed as part of ofnfv release @@ -129,6 +136,7 @@ deploy() { echo " default-series: $opnfvdistro" >> environments.yaml cp environments.yaml ~/.juju/ + cp environments.yaml ~/joid_config/ if [[ "$opnfvtype" = "ha" && "$opnfvlab" = "default" ]]; then createresource @@ -137,8 +145,12 @@ deploy() { #bootstrap the node ./01-bootstrap.sh + if [[ "$jujuver" > "2" ]]; then + juju model-config default-series=$opnfvdistro enable-os-refresh-update=false enable-os-upgrade=false + fi + #case default deploy the opnfv platform: - ./02-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro + ./02-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro $opnfvmodel } #check whether charms are still executing the code even juju-deployer says installed. @@ -150,7 +162,7 @@ check_status() { juju status > status.txt if [ "$(grep -c "executing" status.txt )" -ge 1 ]; then echo " still executing the reltionship within charms ..." - if [ $timeoutiter -ge 90 ]; then + if [ $timeoutiter -ge 120 ]; then retval=1 fi timeoutiter=$((timeoutiter+1)) @@ -159,9 +171,10 @@ check_status() { fi done - juju expose ceph-radosgw - #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"' - + if [[ "$opnfvmodel" = "openstack" ]]; then + juju expose ceph-radosgw || true + #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"' + fi echo "...... deployment finishing ......." } @@ -172,13 +185,23 @@ check_status echo "...... deployment finished ......." -./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true +if [[ "$opnfvmodel" = "openstack" ]]; then + ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true + + # creating heat domain after puching the public API into /etc/hosts + + if [[ "$jujuver" > "2" ]]; then + status=`juju run-action heat/0 domain-setup` + echo $status + else + status=`juju action do heat/0 domain-setup` + echo $status + fi + -# creating heat domain after puching the public API into /etc/hosts -status=`juju action do heat/0 domain-setup` -echo $status + sudo ../juju/get-cloud-images || true + ../juju/joid-configure-openstack || true -sudo ../juju/get-cloud-images || true -../juju/joid-configure-openstack || true +fi echo "...... finished ......."