X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fappc%2Fsrc%2Fmain%2Fscripts%2FdockerInstall.sh;h=4ac996d48129fc9ecab5d7123346fc8be6b894d4;hb=b8e46a813a4c1810e9845d2013611d02da129d1b;hp=7708dcb7f151673498a07754f926c104deb798a0;hpb=6989e98ea8d2293aa90aacc1b864fb724643156e;p=appc%2Fdeployment.git diff --git a/installation/appc/src/main/scripts/dockerInstall.sh b/installation/appc/src/main/scripts/dockerInstall.sh index 7708dcb..4ac996d 100644 --- a/installation/appc/src/main/scripts/dockerInstall.sh +++ b/installation/appc/src/main/scripts/dockerInstall.sh @@ -64,14 +64,6 @@ 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 #The karaf command will exit when odl shuts down. This is the most reliable way to wait for opendaylight to stop