From e7360f7e7e77672b885087af68a3d96ebbc8c313 Mon Sep 17 00:00:00 2001
From: Zlatko Murgoski <zlatko.murgoski@nokia.com>
Date: Mon, 4 Feb 2019 09:27:00 +0100
Subject: Restart Issue

Restart Issue

Issue-ID: DCAEGEN2-1104
Change-Id: Iac1ee2f79be00084f5c0cd963503d54d7d6e6cb9
Signed-off-by: Zlatko Murgoski <zlatko.murgoski@nokia.com>
---
 src/main/scripts/appController.sh | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'src/main/scripts/appController.sh')

diff --git a/src/main/scripts/appController.sh b/src/main/scripts/appController.sh
index d141addf..97556c4c 100644
--- a/src/main/scripts/appController.sh
+++ b/src/main/scripts/appController.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-
 ###
 # ============LICENSE_START=======================================================
 # PROJECT
@@ -22,26 +21,6 @@
 ###
 source bin/logger.sh
 
-updateKeystore() {
-    log "Updating keystore configuration"
-    aliasParameterName="collector.keystore.alias"
-    originalPropertyFile="etc/collector.properties"
-    temporaryPropertyFile="etc/collector.properties.tmp"
-    keystorePath=`grep collector.keystore.file.location ${originalPropertyFile} | tr -d '[:space:]' | cut -d"=" -f2`
-    keystorePasswordFile=`grep collector.keystore.passwordfile ${originalPropertyFile} | tr -d '[:space:]' | cut -d"=" -f2`
-    temporaryAlias=`/usr/bin/keytool -list -keystore $keystorePath < $keystorePasswordFile | grep "PrivateKeyEntry" | cut -d"," -f1`
-    newAlias=`echo $temporaryAlias | cut -d":" -f2`
-    sed "s~$aliasParameterName=.*~$aliasParameterName=$newAlias~g" ${originalPropertyFile} > ${temporaryPropertyFile}
-    echo `cat ${temporaryPropertyFile} > ${originalPropertyFile}`
-    rm ${temporaryPropertyFile}
-    log "Keystore configuration updated"
-}
-
-tryToPollConfiguration() {
-    log "Trying to poll configuration from CBS before application starts"
-    ${JAVA_HOME}/bin/java -cp "etc:lib/*" org.onap.dcae.controller.PreAppStartupConfigUpdater
-}
-
 start() {
     log "Starting application"
     appPids=`pidof java`
@@ -78,7 +57,7 @@ stop() {
 }
 
 case $1 in
-  "start")    tryToPollConfiguration; updateKeystore; start ;;
+  "start")    start ;;
   "stop")     stop ;;
   "restart")  stop; start ;;
   *)          echo "Bad usage. Should be: /bin/bash <this> start/stop"
-- 
cgit 1.2.3-korg