From: Martin Kulhavy <martin.kulhavy@nokia.com>
Date: Thu, 10 Aug 2017 11:25:03 +0000 (+0300)
Subject: Don't convert JOID depl. mode from noha to nonha
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=270d47819058ba5a2b36f71ddfb064e05653abeb;p=releng.git

Don't convert JOID depl. mode from noha to nonha

JOID is not using nonha deployment mode anymore.

Reference change in JOID: https://gerrit.opnfv.org/gerrit/38973

Change-Id: Idc901551862d3936246afc06f0a97ab15d10b91d
Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
---

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index e197dbd8c..9740d38bf 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -94,9 +94,6 @@ EXTRA=${DEPLOY_OPTIONS[4]}
 if [ "$SDN_CONTROLLER" == 'odl_l2' ] || [ "$SDN_CONTROLLER" == 'odl_l3' ]; then
     SDN_CONTROLLER='odl'
 fi
-if [ "$HA_MODE" == 'noha' ]; then
-    HA_MODE='nonha'
-fi
 
 # Add extra to features
 if [ "$EXTRA" != "" ];then