diff options
| author |   meimei <meimei@huawei.com> | 2016-01-26 09:42:57 +0800 |
|---|---|---|
| committer | meimei <meimei@huawei.com> | 2016-01-26 09:46:58 +0800 |
| commit | 918fd9b590cff5c50ac28872a61cc542822e9a99 (patch) | |
| tree | 815e93aabdd8bb081cb1cadf1f2767ebe4d00e36 /jjb/compass4nfv/compass-deploy-virtual.sh | |
| parent | 223f380a4e76c576a816b3b532ef67a1265e9a80 (diff) | |
[compass] merge the scripts of compass-deploy-bare.sh and compass-deploy-virtual
Change-Id: Ic181b7905a4be532a0fc8737b6af4d7323062a7a
Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv/compass-deploy-virtual.sh')
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-virtual.sh | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/jjb/compass4nfv/compass-deploy-virtual.sh b/jjb/compass4nfv/compass-deploy-virtual.sh deleted file mode 100644 index 4991350a0..000000000 --- a/jjb/compass4nfv/compass-deploy-virtual.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -set -x - -# log info to console -echo "Starting the deployment on virtual environment using $INSTALLER_TYPE. This could take some time..." -echo "--------------------------------------------------------" -echo - -export ISO_URL=file://$BUILD_DIRECTORY/compass.iso -export OS_VERSION=${{COMPASS_OS_VERSION}} -export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -export CONFDIR=$WORKSPACE/deploy/conf/vm_environment -./deploy.sh --dha $CONFDIR/$DEPLOY_SCENARIO.yml --network $CONFDIR/$NODE_NAME/network.yml -if [ $? -ne 0 ]; then - echo "depolyment failed!" - deploy_ret=1 -fi - -echo -echo "--------------------------------------------------------" -echo "Done!" - -ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -sshpass -p root scp 2>/dev/null $ssh_options root@${{INSTALLER_IP}}:/var/ansible/run/openstack_${{COMPASS_OPENSTACK_VERSION}}-opnfv2/ansible.log ./ &> /dev/null - -exit $deploy_ret |