Update install-feature for pre-install

[appc.git] / appc-adapters / appc-iaas-adapter / appc-iaas-adapter-installer / src / main / resources / scripts / install-feature.sh

diff --git a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh
old mode 100644 (file)
new mode 100755 (executable)
index 13d41ca..8369101
--- a/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh
+++ b/appc-adapters/appc-iaas-adapter/appc-iaas-adapter-installer/src/main/resources/scripts/install-feature.sh
@@ -1,8 +1,10 @@
+#!/bin/bash
+
 ###
 # ============LICENSE_START=======================================================
 # ONAP : APPC
 # ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Copyright (C) 2017 Amdocs
 # =============================================================================
@@ -18,15 +20,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # 
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 # ============LICENSE_END=========================================================
 ###
 
-#!/bin/bash
-
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""}
 INSTALLERDIR=$(dirname $0)
 
 REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -34,9 +33,7 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
 if [ -f ${REPOZIP} ]
 then
        unzip -n -d ${ODL_HOME} ${REPOZIP}
-else
-       echo "ERROR : repo zip ($REPOZIP) not found"
-       exit 1
+
 fi
 
 COUNT=0
@@ -50,14 +47,3 @@ while [ $COUNT -lt 10 ]; do
        fi
        let COUNT=COUNT+1
 done
-COUNT=0
-while [ $COUNT -lt 10 ]; do
-       ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} 2> /tmp/installErr
-               cat /tmp/installErr
-       if grep -q 'Failed to get the session' /tmp/installErr; then
-               sleep 10
-       else
-               let COUNT=10
-       fi
-       let COUNT=COUNT+1
-done