X-Git-Url: https://gerrit.onap.org/r/gitweb?p=appc%2Fdeployment.git;a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fscripts%2FdockerInstall.sh;h=7708dcb7f151673498a07754f926c104deb798a0;hp=acd0defcb90af3809f879c522f83a9b911186050;hb=6989e98ea8d2293aa90aacc1b864fb724643156e;hpb=a2495c362fbc750e2f5793a34752ff2ea7c991a4 diff --git a/installation/appc/src/main/scripts/dockerInstall.sh b/installation/appc/src/main/scripts/dockerInstall.sh index acd0def..7708dcb 100644 --- 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} @@ -76,13 +72,13 @@ 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"