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>

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index c300417..730f0d1 100755 (executable)
--- 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 60fee92..833a1d4 100644 (file)
--- 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'