From: DarraghEgan <darragh.egan@est.tech>
Date: Mon, 25 Mar 2019 18:04:31 +0000 (+0000)
Subject: SDNC-665: Change to startODL for oam repo
X-Git-Tag: 4.0.0-ONAP~288^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=commitdiff_plain;h=dbb5b682453d24bd03ef83f964a3983a0ddaaff6

SDNC-665: Change to startODL for oam repo

This is for the post operation of keystore to add
new keystore to odl while it's coming up and also
to add certificates and keys that are available
to odl's keystore and truststore

When sdnc/oam gets mounted and so does oom repo,
the startODL.sh in the oam repo gets overwritten
by the startODL.sh in the oom repo. This change
updates the startODL.sh so both scripts will be
the same in each repo

Issue-ID: SDNC-665
Change-Id: Ie9096c4d68e8c0c88682d188194c386e69b0108d
Signed-off-by: DarraghEgan <darragh.egan@est.tech>
---

diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh
index d1b0c995d5..6718aaf128 100755
--- a/kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/kubernetes/sdnc/resources/config/bin/startODL.sh
@@ -80,6 +80,7 @@ function enable_odl_cluster(){
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
 SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc}
+SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin}
 CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
 SLEEP_TIME=${SLEEP_TIME:-120}
 MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
@@ -131,5 +132,10 @@ then
         echo "Installed at `date`" > ${SDNC_HOME}/.installed
 fi
 
+cp /opt/opendaylight/current/certs/* /tmp
+
+nohup python ${SDNC_BIN}/installCerts.py &
+
+
 exec ${ODL_HOME}/bin/karaf server