Change to feature pre-install

[appc/deployment.git] / installation / appc / src / main / scripts / startODL.sh

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index a359d02..52e524b 100644 (file)
--- a/installation/appc/src/main/scripts/startODL.sh
+++ b/installation/appc/src/main/scripts/startODL.sh
@@ -4,7 +4,7 @@
 # ============LICENSE_START=======================================================
 # APPC
 # ================================================================================
-# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,8 +32,6 @@ APPC_HOME=${APPC_HOME:-/opt/onap/appc}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
-appcInstallStartTime=$(date +%s)
-
 #
 # Adding the DMAAP_TOPIC_ENV variable into APPC-ASDC-LISTENER properties
 #
@@ -47,11 +45,6 @@ if [ -z "$DMAAP_TOPIC_ENV" ]
                echo "DMAAP_TOPIC_ENV shell variable exists and it's $DMAAP_TOPIC_ENV"
 fi
 
-echo "Adding a value to property appc.asdc.env in appc.properties for appc-asdc-listener feature"
-echo "" >> $APPC_HOME/data/properties/appc.properties
-echo "appc.asdc.env=$DMAAP_TOPIC_ENV" >> $APPC_HOME/data/properties/appc.properties
-echo "" >> $APPC_HOME/data/properties/appc.properties
-
 #
 # Wait for database to init properly
 #
@@ -71,24 +64,13 @@ then
        ${APPC_HOME}/bin/installAppcDb.sh
        echo "Installing ODL Host Key"
        ${SDNC_HOME}/bin/installOdlHostKey.sh
-       echo "Starting OpenDaylight"
-       ${ODL_HOME}/bin/start
-       echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
-       sleep ${SLEEP_TIME}
-       echo "Copying a working version of the logging configuration into the opendaylight etc folder"
-       cp ${APPC_HOME}/data/org.ops4j.pax.logging.cfg ${ODL_HOME}/etc/org.ops4j.pax.logging.cfg
-       echo "Copying a new version of aaf cadi shiro into the opendaylight deploy folder"
-       cp ${APPC_HOME}/data/aaf-shiro-aafrealm-osgi-bundle.jar ${ODL_HOME}/deploy/aaf-shiro-aafrealm-osgi-bundle.jar
-       echo "Installing SDNC platform features"
-       ${SDNC_HOME}/bin/installFeatures.sh
+
        if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
        then
                echo "Installing directed graphs"
                ${SDNC_HOME}/svclogic/bin/install.sh
        fi
        
-       echo "Installing APPC platform features"
-       ${APPC_HOME}/bin/installFeatures.sh
        
        
 
@@ -98,42 +80,11 @@ then
                ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh
        fi
        
-       echo "Adding a property system.properties for AAF cadi.properties location"
-       echo "" >> ${ODL_HOME}/etc/system.properties
-       echo "cadi_prop_files=${APPC_HOME}/data/properties/cadi.properties" >> ${ODL_HOME}/etc/system.properties
-       echo "" >> ${ODL_HOME}/etc/system.properties
-       
-       echo "Copying the aaa shiro configuration into opendaylight"
-    cp ${APPC_HOME}/data/aaa-app-config.xml ${ODL_HOME}/etc/opendaylight/datastore/initial/config/aaa-app-config.xml
-
-    echo "Restarting OpenDaylight"
-    ${ODL_HOME}/bin/stop
-       checkRun () {
-               running=0
-               while read a b c d e f g h
-               do
-               if [ "$h" == "/bin/sh /opt/opendaylight/bin/karaf server" ]
-               then
-                       running=1
-               fi
-               done < <(ps -eaf)
-               echo $running
-       }
-       
-       while [ $( checkRun ) == 1 ]
-       do
-               echo "Karaf is still running, waiting..."
-               sleep 5s
-       done
-       echo "Karaf process has stopped"
-       sleep 10s
-       echo "Installed at `date`" > ${SDNC_HOME}/.installed
+echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi
 
-       appcInstallEndTime=$(date +%s)
-       echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
-
 echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
 java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
 
+echo "Starting ODL/APPC"
 exec ${ODL_HOME}/bin/karaf server