X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fscripts%2FstartODL.sh;h=f58db40df0f031ee40d8df3b1c6019c1e5e817fe;hb=refs%2Fheads%2Fmaster;hp=8faddb95997fb5cc4227c96a5c4ad3d4aef3f9a1;hpb=fbeb51879131ef62b27ecfc9d5aef55c22e0ea5c;p=appc%2Fdeployment.git

diff --git a/installation/appc/src/main/scripts/startODL.sh b/installation/appc/src/main/scripts/startODL.sh
index 8faddb9..1d33eb4 100644
--- 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
 #
@@ -69,31 +62,17 @@ then
 	${SDNC_HOME}/bin/installSdncDb.sh
 	echo "Installing APPC database"
 	${APPC_HOME}/bin/installAppcDb.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
+	echo "Installing ODL Host Key"
+	${SDNC_HOME}/bin/installOdlHostKey.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
 	
 	
-	if [ -x ${APPC_HOME}/svclogic/bin/install.sh ]
-	then
-		echo "Installing APPC DGs using platform-logic"
-		${APPC_HOME}/svclogic/bin/install.sh
-	fi
 
 	if [ -x ${APPC_HOME}/svclogic/bin/install-converted-dgs.sh ]
 	then
@@ -101,22 +80,41 @@ 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 a working version of the shiro configuration into the opendaylight etc folder"
- 	cp ${APPC_HOME}/data/shiro.ini ${ODL_HOME}/etc/shiro.ini
-
-    echo "Restarting OpenDaylight"
-    ${ODL_HOME}/bin/stop
-    echo "Waiting 60 seconds for OpenDaylight stop to complete"
-    sleep 60
-	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 dmaap-event-service jar, logging to ${APPC_HOME}/dmaap-event-service/jar.log"
+java -jar -Dorg_onap_appc_bootstrap_path=/opt/onap/appc/data/properties -Dorg_onap_appc_bootstrap_file=appc.properties ${APPC_HOME}/dmaap-event-service/dmaap-event-service.jar > ${APPC_HOME}/dmaap-event-service/jar.log &
+
+echo "Starting ODL/APPC"
+
+#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 "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 "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
+
+echo "Copying jetty, keystore for https into opendalight"
+cp ${APPC_HOME}/data/jetty.xml ${ODL_HOME}/etc/jetty.xml
+cp ${APPC_HOME}/data/keystore ${ODL_HOME}/etc/keystore
+cp ${APPC_HOME}/data/custom.properties ${ODL_HOME}/etc/custom.properties
+
+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
+
+ODL_BOOT_FEATURES_EXTRA="odl-netconf-connector,odl-restconf-noauth,odl-netconf-clustered-topology,odl-mdsal-clustering"
+sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|"  $ODL_HOME/etc/org.apache.karaf.features.cfg
 
-exec ${ODL_HOME}/bin/karaf
+exec ${APPC_HOME}/bin/dockerInstall.sh &
+echo "Starting OpenDaylight"
+exec ${ODL_HOME}/bin/karaf server