summaryrefslogtreecommitdiffstats
path: root/jjb/compass4nfv/compass-deploy-bare.sh
diff options
context:
space:
mode:
authormeimei <meimei@huawei.com>2016-01-14 20:33:16 +0800
committermeimei <meimei@huawei.com>2016-01-16 09:40:25 +0800
commitacbc6c8cc62a269a0276c59a8035e134e3041371 (patch)
tree0f02018781050b44ec809177b44e7a4a3663db25 /jjb/compass4nfv/compass-deploy-bare.sh
parent31f5b9514420267a75de1ea331ce0c4efe4a919c (diff)
compass: Align scenario short names
Change-Id: I3d936bac7f54b860caf4a9e48bc298c7ff5da087 Signed-off-by: meimei <meimei@huawei.com>
Diffstat (limited to 'jjb/compass4nfv/compass-deploy-bare.sh')
-rw-r--r--jjb/compass4nfv/compass-deploy-bare.sh4
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