diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2018-01-18 03:18:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-18 03:18:41 +0000 |
| commit | f857fe71def700692cd6de3f5fa0ed82632aeb12 (patch) | |
| tree | 336c70f81cf1ef984458e314ef78a8866857276f /ci | |
| parent | 9ab9ac3fb8b93416c8b60a4440bda4f16187c00d (diff) | |
| parent | 1ff254d110de82929780a2334ac4d2b785107c9b (diff) | |
Merge "no need to separate dpdk from network.yaml.j2"
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/deploy/deploy.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh index 7d749af9..bfad429d 100755 --- a/ci/deploy/deploy.sh +++ b/ci/deploy/deploy.sh @@ -186,11 +186,7 @@ function update_dha_by_pdf() local pdf_yaml=labs/$LAB_NAME/${POD_NAME}.yaml local pod_template=config/installers/daisy/pod_config.yaml.j2 local generate_config=config/utils/generate_config.py - if [[ $DEPLOY_SCENARIO =~ (dpdk) ]]; then - local network_template=config/installers/daisy/network-dpdk.yaml.j2 - else - local network_template=config/installers/daisy/network.yaml.j2 - fi + local network_template=config/installers/daisy/network.yaml.j2 if [ ! -f ${generate_config} ] || [ ! -f ${pdf_yaml} ] || [ ! -f ${pod_template} ] || [ ! -f ${network_template} ] ; then echo "Template files donot exist in ${SECURELABDIR}." return |