diff options
author | Skip Wonnell <kw5258@att.com> | 2017-08-29 14:16:20 -0500 |
---|---|---|
committer | Skip Wonnell <kw5258@att.com> | 2017-08-30 08:17:34 -0500 |
commit | 8c9631e438b9491424df0f43d43445f098436834 (patch) | |
tree | c355ed09a765614a9be25d1e6e88b06b753d7f30 /appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources | |
parent | 51f905f307dde5e1c5135515796c614250e9de4d (diff) |
ChefAdapter code clean-up
Issue-ID: APPC-90
Change-Id: I582d6b0c81d5a89938fff6038dfcc221ccaf19c1
Signed-off-by: Skip Wonnell <kw5258@att.com>
Diffstat (limited to 'appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources')
-rw-r--r-- | appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh index 13d41ca56..d0210eb06 100644 --- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh +++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-installer/src/main/resources/scripts/install-feature.sh @@ -33,31 +33,11 @@ REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip if [ -f ${REPOZIP} ] then - unzip -n -d ${ODL_HOME} ${REPOZIP} + unzip -n -d ${ODL_HOME} ${REPOZIP} else - echo "ERROR : repo zip ($REPOZIP) not found" - exit 1 + echo "ERROR : repo zip ($REPOZIP) not found" + exit 1 fi -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 -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 +${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} +${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} |