From: Dan Radez <dradez@redhat.com>
Date: Wed, 23 Nov 2016 17:37:36 +0000 (-0500)
Subject: Apex using a different network settings file for master
X-Git-Tag: danube.1.0~624^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0b177b60ee8455b9118734532eb98e153caa17ae;p=releng.git

Apex using a different network settings file for master

Network settings file format has changed for master

Change-Id: I3d6a30b5223ca9525a7e344db1550ee5bdfd7776
Signed-off-by: Dan Radez <dradez@redhat.com>
---

diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh
index e21387ac6..bbceb4b88 100755
--- a/jjb/apex/apex-deploy.sh
+++ b/jjb/apex/apex-deploy.sh
@@ -176,6 +176,8 @@ else
   # settings for bare metal deployment
   if [ "$IPV6_FLAG" == "True" ]; then
     NETWORK_FILE="/root/network/network_settings_v6.yaml"
+  elif [[ "$JOB_NAME" == *master* ]]; then
+    NETWORK_FILE="/root/network/network_settings-master.yaml"
   else
     NETWORK_FILE="/root/network/network_settings.yaml"
   fi