From: Feng Pan <fpan@redhat.com>
Date: Mon, 13 Feb 2017 22:46:45 +0000 (-0500)
Subject: APEX: Add fdio specific network settings file to virtual deployments
X-Git-Tag: danube.1.0~276^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F61%2F28561%2F1;p=releng.git

APEX: Add fdio specific network settings file to virtual deployments

Change-Id: I9bbcd1b801d10b6fab6b32b33372260ac2e65cae
Signed-off-by: Feng Pan <fpan@redhat.com>
---

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index b68225f15..dc70488e7 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -183,6 +183,8 @@ if [[ "$JOB_NAME" == *virtual* ]]; then
   # settings for virtual deployment
   if [ "$IPV6_FLAG" == "True" ]; then
     NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_v6.yaml"
+  elif echo ${DEPLOY_SCENARIO} | grep fdio; then
+    NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings_vpp.yaml"
   else
     NETWORK_FILE="${NETWORK_SETTINGS_DIR}/network_settings.yaml"
   fi