From 68195fd98e2633049858eef179231a5ba13980ce Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 1 Aug 2017 19:06:00 +0200
Subject: [PATCH] fuel, armband: Drop "-H" arg, fix bridge default

MCP does not have a self-test healtcheck suite, similar to old
Fuel, so we dropped the "-H" deploy argument (which used to disable
healtcheck autorun).
Adjust deploy command to reflect this installer change.

While at it, fix leftover "pxebr" default installer parameter,
which we missed in the previous commit where we changed the
default only in releng deploy scripts.

Change-Id: I55e1f5cad17687bdf304fbf04d67366dd32ed42a
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 jjb/armband/armband-deploy.sh              | 2 +-
 jjb/fuel/fuel-deploy.sh                    | 2 +-
 jjb/global/installer-params.yml            | 4 ++--
 jjb/multisite/fuel-deploy-for-multisite.sh | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index 8a3b60458..08d323325 100755
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -91,7 +91,7 @@ fi
 # construct the command
 DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
     -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
-    -H -B ${DEFAULT_BRIDGE:-,,,} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
+    -B ${DEFAULT_BRIDGE:-,,,} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
     ${DEPLOY_CACHE}"
 
 # log info to console
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index c9329bfa0..29b173ae5 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -69,7 +69,7 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
 # construct the command
 DEPLOY_COMMAND="sudo $WORKSPACE/ci/deploy.sh -b file://$WORKSPACE/securedlab \
     -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso \
-    -H -B $BRIDGE -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
+    -B $BRIDGE -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
 
 # log info to console
 echo "Deployment parameters"
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 5e07a11f9..17101ed76 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -55,8 +55,8 @@
             description: 'external network for test'
         - string:
             name: BRIDGE
-            default: 'pxebr'
-            description: 'pxe bridge for booting of Fuel master'
+            default: ',,,'
+            description: 'Bridge(s) to be used by salt master'
 
 - parameter:
     name: 'joid-defaults'
diff --git a/jjb/multisite/fuel-deploy-for-multisite.sh b/jjb/multisite/fuel-deploy-for-multisite.sh
index 71c6cc11d..827e5c28d 100755
--- a/jjb/multisite/fuel-deploy-for-multisite.sh
+++ b/jjb/multisite/fuel-deploy-for-multisite.sh
@@ -46,7 +46,7 @@ curl -L -s -o $WORKSPACE/opnfv.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2
 # set deployment parameters
 DEPLOY_SCENARIO="os-nosdn-nofeature-noha"
 export TMPDIR=$HOME/tmpdir
-BRIDGE=${BRIDGE:-pxebr}
+BRIDGE=${BRIDGE:-,,,}
 LAB_NAME=${NODE_NAME/-*}
 POD_NAME=${NODE_NAME/*-}
 
@@ -89,7 +89,7 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
 # construct the command
 DEPLOY_COMMAND="sudo $WORKSPACE/fuel/ci/deploy.sh -b file://$WORKSPACE/securedlab \
     -l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://$WORKSPACE/opnfv.iso \
-    -H -B $BRIDGE -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
+    -B $BRIDGE -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME"
 
 # log info to console
 echo "Deployment parameters"
-- 
2.16.6