diff options
| author |   Jun Li <matthew.lijun@huawei.com> | 2016-01-16 02:24:35 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-16 02:24:35 +0000 |
| commit | 5ddd16d41e6bd92a0849577807b177f52ba1ec20 (patch) | |
| tree | 168bffd84a2d73d412a9db644bbaca33f52a0d1c /jjb/compass4nfv/compass-deploy-bare.sh | |
| parent | 909763a61575f1a3ec7a43f63e30fadcaf7cee76 (diff) | |
| parent | acbc6c8cc62a269a0276c59a8035e134e3041371 (diff) | |
Merge "compass: Align scenario short names"
Diffstat (limited to 'jjb/compass4nfv/compass-deploy-bare.sh')
| -rw-r--r-- | jjb/compass4nfv/compass-deploy-bare.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/compass4nfv/compass-deploy-bare.sh b/jjb/compass4nfv/compass-deploy-bare.sh index 12b9b337b..dc0aeb29d 100644 --- a/jjb/compass4nfv/compass-deploy-bare.sh +++ b/jjb/compass4nfv/compass-deploy-bare.sh @@ -6,7 +6,7 @@ echo "Starting the deployment on baremetal environment using $INSTALLER_TYPE. Th echo "--------------------------------------------------------" echo -export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/huawei_us_lab/pod1 +export CONFDIR=$WORKSPACE/deploy/conf/hardware_environment/$NODE_NAME export ISO_URL=file://$BUILD_DIRECTORY/compass.iso export INSTALL_NIC=eth0 @@ -14,7 +14,7 @@ cd $WORKSPACE export OS_VERSION=${{COMPASS_OS_VERSION}} export OPENSTACK_VERSION=${{COMPASS_OPENSTACK_VERSION}} -./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml +./deploy.sh --dha $CONFDIR/${{DEPLOY_SCENARIO}}.yml --network $CONFDIR/network.yml if [ $? -ne 0 ]; then echo "depolyment failed!" deploy_ret=1 |