Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
SDNC using shared mariadb-galera cluster
[oom.git]
/
kubernetes
/
sdnc
/
resources
/
config
/
bin
/
startODL.sh
diff --git
a/kubernetes/sdnc/resources/config/bin/startODL.sh
b/kubernetes/sdnc/resources/config/bin/startODL.sh
index
b94cf4f
..
45b74aa
100755
(executable)
--- a/
kubernetes/sdnc/resources/config/bin/startODL.sh
+++ b/
kubernetes/sdnc/resources/config/bin/startODL.sh
@@
-80,13
+80,14
@@
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}
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}}}
CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
SLEEP_TIME=${SLEEP_TIME:-120}
MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}}
-MYSQL_HOST=${MYSQL_HOST:-{{.
Release.Name}}-{{.Values.mysql.nameOverride}}-0.{{.Values.mysql.service.n
ame}}.{{.Release.Namespace}}}
+MYSQL_HOST=${MYSQL_HOST:-{{.
Values.config.dbServiceN
ame}}.{{.Release.Namespace}}}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
GEO_ENABLED=${GEO_ENABLED:-false}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
GEO_ENABLED=${GEO_ENABLED:-false}
-
INSTALLED_DIR=${INSTALLED_FILE
:-/opt/opendaylight/current/daexim}
+
DBINIT_DIR=${DBINIT_DIR
:-/opt/opendaylight/current/daexim}
#
# Wait for database to init properly
#
# Wait for database to init properly
@@
-99,20
+100,15
@@
do
done
echo -e "\nmysql ready"
done
echo -e "\nmysql ready"
-if [ ! -d ${
INSTALLED
_DIR} ]
+if [ ! -d ${
DBINIT
_DIR} ]
then
then
- mkdir -p ${
INSTALLED
_DIR}
+ mkdir -p ${
DBINIT
_DIR}
fi
fi
-if [ ! -f ${
INSTALLED
_DIR}/.installed ]
+if [ ! -f ${
DBINIT
_DIR}/.installed ]
then
echo "Installing SDNC database"
${SDNC_HOME}/bin/installSdncDb.sh
then
echo "Installing SDNC database"
${SDNC_HOME}/bin/installSdncDb.sh
- echo "Installing SDN-C keyStore"
- ${SDNC_HOME}/bin/addSdncKeyStore.sh
-
- # No longer needed (this was a workaround for bug in Nitrogen)
- #${CCSDK_HOME}/bin/installOdlHostKey.sh
if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
then
if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ]
then
@@
-120,10
+116,26
@@
then
${SDNC_HOME}/svclogic/bin/install.sh
fi
${SDNC_HOME}/svclogic/bin/install.sh
fi
- if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
+ echo "Installed at `date`" > ${DBINIT_DIR}/.installed
+fi
+
+if [ ! -f ${SDNC_HOME}/.installed ]
+then
+ echo "Installing SDN-C keyStore"
+ ${SDNC_HOME}/bin/addSdncKeyStore.sh
- echo "Installed at `date`" > ${INSTALLED_DIR}/.installed
+ # No longer needed (this was a workaround for bug in Nitrogen)
+ #${CCSDK_HOME}/bin/installOdlHostKey.sh
+
+ if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi
+
+ echo "Installed at `date`" > ${SDNC_HOME}/.installed
fi
fi
+cp /opt/opendaylight/current/certs/* /tmp
+
+nohup python ${SDNC_BIN}/installCerts.py &
+
+
exec ${ODL_HOME}/bin/karaf server
exec ${ODL_HOME}/bin/karaf server