summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien <zhang.jun3g@zte.com.cn>2016-08-09 14:06:24 +0800
committerJulien <zhang.jun3g@zte.com.cn>2016-08-09 15:15:30 +0800
commit0c54c56c14ca7a72a2589d4619f52cba45b046f7 (patch)
tree234b0b38e0640d3b41ab856e6fe6d35e1ab1ded8
parent002bc8376f2fde944da4aacaa1e0e9a124f9ce01 (diff)
Add BRIDGE parameter when deploy Fuel
Currently BRIDGE is hardcode with 'pxebr'. If the lab uses another bridge name, it can be use supported in releng. This parameter is supported in Fuel project already. JIRA: RELENG-134 Change-Id: Ie1df46a247eaebb1814506d555f73d03a1e5566e Signed-off-by: Julien-zte <zhang.jun3g@zte.com.cn>
-rwxr-xr-xjjb/fuel/fuel-deploy.sh2
-rw-r--r--jjb/opnfv/installer-params.yml4
2 files changed, 5 insertions, 1 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index c30041711..730f0d116 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -29,7 +29,7 @@ fi
# set deployment parameters
export TMPDIR=$HOME/tmpdir
-BRIDGE=pxebr
+BRIDGE=${BRIDGE:-pxebr}
LAB_NAME=${NODE_NAME/-*}
POD_NAME=${NODE_NAME/*-}
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index 60fee9263..833a1d449 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -49,6 +49,10 @@
name: EXTERNAL_NETWORK
default: 'admin_floating_net'
description: 'external network for test'
+ - string:
+ name: BRIDGE
+ default: 'pxebr'
+ description: 'pxe bridge for booting of Fuel master'
- parameter:
name: 'joid-defaults'