diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-11-19 18:35:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-19 18:35:52 +0000 |
| commit | 043ceb4006aee8bc2750f90522996818d02b0884 (patch) | |
| tree | 4354b231f9cd31e25efcbfe6c8e4224596c9d445 | |
| parent | 90b21b1a7649f60ad3470fa4affaacc6f64ea174 (diff) | |
| parent | eaa6a24c0971dfd2d3488d2f1ce693a2d76e1549 (diff) | |
Merge "Fix SDNC initialization"
| -rwxr-xr-x | kubernetes/sdnc/resources/config/bin/startODL.sh | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh index b94cf4fa7b..d1b0c995d5 100755 --- a/kubernetes/sdnc/resources/config/bin/startODL.sh +++ b/kubernetes/sdnc/resources/config/bin/startODL.sh @@ -86,7 +86,7 @@ MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}} MYSQL_HOST=${MYSQL_HOST:-{{.Release.Name}}-{{.Values.mysql.nameOverride}}-0.{{.Values.mysql.service.name}}.{{.Release.Namespace}}} 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 @@ -99,20 +99,15 @@ do done echo -e "\nmysql ready" -if [ ! -d ${INSTALLED_DIR} ] +if [ ! -d ${DBINIT_DIR} ] then - mkdir -p ${INSTALLED_DIR} + mkdir -p ${DBINIT_DIR} fi -if [ ! -f ${INSTALLED_DIR}/.installed ] +if [ ! -f ${DBINIT_DIR}/.installed ] 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 @@ -120,9 +115,20 @@ then ${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 + + # 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`" > ${INSTALLED_DIR}/.installed + echo "Installed at `date`" > ${SDNC_HOME}/.installed fi exec ${ODL_HOME}/bin/karaf server |