no need to separate dpdk from network.yaml.j2 09/50209/1
author00184532 <lu.yao135@zte.com.cn>
Mon, 8 Jan 2018 09:11:19 +0000 (17:11 +0800)
committer00184532 <lu.yao135@zte.com.cn>
Mon, 8 Jan 2018 09:11:19 +0000 (17:11 +0800)
Change-Id: I1e2f89f0c6ad1d292a2788910755df17802b3683
Signed-off-by: 00184532 <lu.yao135@zte.com.cn>
ci/deploy/deploy.sh

index ff74061..b617a17 100755 (executable)
@@ -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