summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-02-14 17:18:11 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-14 17:18:11 +0000
commit404ba6bd9aba7010566919292e3b2cb9432acb35 (patch)
tree8ff4b75ff9d5b5c07438a2a0b47824906fdd9e41 /jjb
parent905f19b09e5ded244696fd774b29551cf8663f10 (diff)
parent043ca0493fb669a92dee96c2d9051dabf1d57fd2 (diff)
Merge "APEX: Add fdio specific network settings file to virtual deployments"
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/apex/apex-deploy.sh2
1 files changed, 2 insertions, 0 deletions
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