diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-04 13:11:44 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-12-04 19:38:59 -0600 |
commit | 6c7fc201c56648de9622dffc48a3f47e81de9465 (patch) | |
tree | d2c9218d0da1a2f05a6058f1b0c0b83e89c49b84 /ci/deploy.sh | |
parent | b4ee809c40d27d3323bb19b4edfd188ebd0535d6 (diff) |
modified to comment the use of juju-br0 as external network.
Added option to install neutron-openswitch without ODL.
consolidated source files to common as all sdn share the s
same source for openstack and it can be modified during deployment.
Change-Id: I1df7f5cd5d928d170bc6be6b32c3404dbcb5fda3
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-x | ci/deploy.sh | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 0c6fc892..b98d2145 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -5,7 +5,7 @@ set -ex #need to put mutiple 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=odl +opnfvsdn=nosdn opnfvtype=nonha openstack=liberty opnfvlab=default @@ -19,9 +19,9 @@ read_config() { opnfvsdn=`grep sdn: deploy.yaml | cut -d ":" -f2` } -usage() { echo "Usage: $0 [-s <odl|opencontrail>] +usage() { echo "Usage: $0 [-s <nosdn|odl|opencontrail>] [-t <nonha|ha|tip>] - [-o <juno|kilo|liberty>] + [-o <juno|liberty>] [-l <default|intelpod5>] [-r <a|b>]" 1>&2 exit 1; } @@ -60,7 +60,7 @@ deploy_dep() { deploy() { #copy the script which needs to get deployed as part of ofnfv release - echo "deploying now" + echo "...... deploying now ......" echo " " >> environments.yaml echo " enable-os-refresh-update: false" >> environments.yaml echo " enable-os-upgrade: false" >> environments.yaml @@ -76,12 +76,24 @@ deploy() { ./01-deploybundle.sh $opnfvtype $openstack $opnfvlab } +check_status() { + while [ $? -eq 0 ]; do + sleep 60 + echo " still executing the reltionship within charms ..." + juju status | grep executing > /dev/null + done + echo "...... deployment finishing ......." +} + if [ "$#" -eq 0 ]; then echo "This installtion will use deploy.yaml" read_config fi -echo "deploying started" +echo "...... deployment started ......" #deploy_dep deploy -echo "deploying finished" +check_status + +echo "...... deployment finished ......." + |