X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fscripts%2FdockerInstall.sh;h=c93aae36f2f667989ef313ad933bb6e706d6737a;hb=bc6ce262858bf9ce5ac6530ccfe1e84011eac3c8;hp=4ac996d48129fc9ecab5d7123346fc8be6b894d4;hpb=b8e46a813a4c1810e9845d2013611d02da129d1b;p=appc%2Fdeployment.git

diff --git a/installation/appc/src/main/scripts/dockerInstall.sh b/installation/appc/src/main/scripts/dockerInstall.sh
index 4ac996d..c93aae3 100644
--- a/installation/appc/src/main/scripts/dockerInstall.sh
+++ b/installation/appc/src/main/scripts/dockerInstall.sh
@@ -46,31 +46,8 @@ echo "Error during Karaf login"
 exit 1
 fi
 
-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 APPC platform features"
 ${APPC_HOME}/bin/installFeatures.sh
 
-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 "Stopping OpenDaylight and waiting for it to stop"
-#${ODL_HOME}/bin/stop
-#The karaf command will exit when odl shuts down. This is the most reliable way to wait for opendaylight to stop
-#before exiting the docker container.
-#${ODL_HOME}/bin/client
-#echo "Karaf process has stopped"
-#sleep 10s
-
 appcInstallEndTime=$(date +%s)
 echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"