diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-10 00:12:59 -0500 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-06-10 00:14:10 -0500 |
commit | 2367ad5ad0ea945bad5c08b6f28b6cc5d3f271aa (patch) | |
tree | 487a3c2090fe134ef73b877bcc8c61f359c1c60f /ci/deploy.sh | |
parent | 700b7813fa18eda277b303a3de5905d3d875eec9 (diff) |
modified the deployment and merge juju test file for onos.
Change-Id: Ib65063fa95a65e8c3e634d91187870e8aa45f5a8
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-x | ci/deploy.sh | 52 |
1 files changed, 7 insertions, 45 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 31d435b4..b81673c3 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -149,56 +149,18 @@ check_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 - - controller_address=$(unitAddress keystone 0) - configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical - chmod 0600 cloud/admin-openrc -} - -if [ "$#" -eq 0 ]; then - echo "This installtion will use default options" - #read_config -fi - echo "...... deployment started ......" #deploy_dep deploy check_status - -#create the basic dayta for verification of stack. -./openstack.sh - echo "...... deployment finished ......." -echo "...... creating OpenRc file for consuming by various user ......." - -createopenrc +if [ "$opnfvsdn" == "onos" ]; then + ./openstack.sh "$opnfvlab" + check_status +else + #create the basic data for verification of stack. + ./openstack.sh +fi echo "...... finished ......." - - |