summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-11-23 12:37:36 -0500
committerDan Radez <dradez@redhat.com>2016-11-23 12:37:36 -0500
commit0b177b60ee8455b9118734532eb98e153caa17ae (patch)
treef51d1a549540d26d5570da9aa0ea240162b26313
parent4da12f732e8aa918719c2a8c30e7a78dc0b15428 (diff)
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>
-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 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