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 1d769fa..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,10 +1,13 @@
+#!/bin/bash
+
 ###
 # ============LICENSE_START=======================================================
-# openECOMP : APP-C
+# 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
+# =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -16,14 +19,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+# 
 # ============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
@@ -31,10 +33,17 @@ 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
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+COUNT=0
+while [ $COUNT -lt 10 ]; do
+       ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} 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