diff options
| author |   meimei <meimei@huawei.com> | 2016-05-24 02:47:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-24 02:47:37 +0000 |
| commit | 6cd78f540cfe239155a3111328c55a3a63b9bf9a (patch) | |
| tree | fd32e951602abcc213dc452fb74d96d1e79f7daf /jjb/compass4nfv/compass-deploy.sh | |
| parent | d1c6148e340770a7725c80fd25387c11bdffe9e2 (diff) | |
| parent | 2001de436ca7411591325a27cb2b6e3745b2039b (diff) | |
Merge "[compass4nfv] enable opencontrail ci jobs in compass"
Diffstat (limited to 'jjb/compass4nfv/compass-deploy.sh')
| -rw-r--r-- | jjb/compass4nfv/compass-deploy.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh index 790d43b87..098cfe99d 100644 --- a/jjb/compass4nfv/compass-deploy.sh +++ b/jjb/compass4nfv/compass-deploy.sh @@ -24,12 +24,19 @@ echo 1 > /proc/sys/vm/drop_caches export CONFDIR=$WORKSPACE/deploy/conf export ISO_URL=file://$BUILD_DIRECTORY/compass.iso + +if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]] + export NETWORK_CONF_FILE=network_ocl.yml +else + export NETWORK_CONF_FILE=network.yml +fi + if [[ "$NODE_NAME" =~ "-virtual" ]]; then - export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml + export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE} export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml else export INSTALL_NIC=eth1 - export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/network.yml + export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE} export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml fi |