diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-11-28 14:47:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-28 14:47:20 +0000 |
| commit | a3a94ffd4a58d4ac8fd837e22605b5083f2127ca (patch) | |
| tree | fc920a61580addd0e4aae3426c5aeae6de1267fa /jjb | |
| parent | f7f969d10f2eb085df203ad3cb592788d834b45c (diff) | |
| parent | 0b177b60ee8455b9118734532eb98e153caa17ae (diff) | |
Merge "Apex using a different network settings file for master"
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 2 |
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 |