Merge "Add a configurable truststore for A1 adapter"

[sdnc/oam.git] / installation / sdnc / src / main / scripts / startODL.sh

diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh
index e043bc0..86d1e09 100755 (executable)
--- a/installation/sdnc/src/main/scripts/startODL.sh
+++ b/installation/sdnc/src/main/scripts/startODL.sh
@@ -152,6 +152,8 @@ then
        ${SDNC_HOME}/bin/installSdncDb.sh
        echo "Installing SDN-C keyStore"
        ${SDNC_HOME}/bin/addSdncKeyStore.sh
+       echo "Installing A1-adapter trustStore"
+       ${SDNC_HOME}/bin/addA1TrustStore.sh
 
        #${CCSDK_HOME}/bin/installOdlHostKey.sh
 
@@ -171,8 +173,11 @@ then
 fi
 
 cp /opt/opendaylight/current/certs/* /tmp
-cp -r /opt/app/osaaf/local/. /tmp
+cp /var/custom-certs/* /tmp
 
-nohup python ${SDNC_BIN}/installCerts.py &
+# Create ODL data log directory (it nornally is created after karaf
+# is started, but needs to exist before installCerts.py runs)
+mkdir -p /opt/opendaylight/data/log
+nohup python3 ${SDNC_BIN}/installCerts.py &
 
 exec ${ODL_HOME}/bin/karaf server