Move location of config copy

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

diff --git a/installation/appc/src/main/scripts/dockerInstall.sh b/installation/appc/src/main/scripts/dockerInstall.sh
index acd0def..4ac996d 100644 (file)
--- a/installation/appc/src/main/scripts/dockerInstall.sh
+++ b/installation/appc/src/main/scripts/dockerInstall.sh
@@ -33,11 +33,7 @@ MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0}
 
 appcInstallStartTime=$(date +%s)
 
-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
 
-echo "Starting OpenDaylight"
-${ODL_HOME}/bin/start
 echo "Waiting ${SLEEP_TIME} seconds for OpenDaylight to initialize"
 sleep ${SLEEP_TIME}
 
@@ -68,21 +64,13 @@ 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 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 "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 "Stopping OpenDaylight and waiting for it to stop"
-${ODL_HOME}/bin/stop
+#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
+#${ODL_HOME}/bin/client
+#echo "Karaf process has stopped"
+#sleep 10s
 
 appcInstallEndTime=$(date +%s)
 echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"