diff options
Diffstat (limited to 'ci/deploy.sh')
| -rwxr-xr-x | ci/deploy.sh | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 207482e2..d61e3bad 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -2,7 +2,7 @@ set -ex -#need to put mutiple cases here where decide this bundle to deploy by default use the odl bundle. +#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 @@ -136,8 +136,8 @@ deploy() { echo " MAAS not deployed please deploy MAAS first." fi fi -#create json file which is missing in case of new deployment after maas and git tree cloned freshly. + #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 @@ -175,17 +175,19 @@ deploy() { #check whether charms are still executing the code even juju-deployer says installed. check_status() { + waitstatus=$1 retval=0 timeoutiter=0 - echo -n "executing the reltionship within charms ." + echo -n "executing the relationship within charms ." while [ $retval -eq 0 ]; do - sleep 30 - if juju status | grep -q "executing"; then + if juju status | grep -q $waitstatus; then echo -n '.' if [ $timeoutiter -ge 120 ]; then echo 'timed out' retval=1 + else + sleep 30 fi timeoutiter=$((timeoutiter+1)) else @@ -198,13 +200,14 @@ check_status() { juju expose ceph-radosgw || true #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"' fi + echo "...... deployment finishing ......." -} + } echo "...... deployment started ......" deploy -check_status +check_status executing echo "...... deployment finished ......." @@ -242,7 +245,7 @@ echo "...... configure ......." if ([ $opnfvmodel == "openstack" ]); then ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true - # creating heat domain after puching the public API into /etc/hosts + # creating heat domain after pushing the public API into /etc/hosts if [[ "$jujuver" > "2" ]]; then status=`juju run-action heat/0 domain-setup` echo $status @@ -254,6 +257,10 @@ if ([ $opnfvmodel == "openstack" ]); then sudo ../juju/get-cloud-images || true ../juju/joid-configure-openstack || true + if grep -q 'openbaton' bundles.yaml; then + juju add-relation openbaton keystone + fi + elif ([ $opnfvmodel == "kubernetes" ]); then ./k8.sh fi |