diff options
Diffstat (limited to 'kubernetes/sdnc/resources')
| -rwxr-xr-x | kubernetes/sdnc/resources/config/bin/startODL.sh | 26 | ||||
| -rw-r--r-- | kubernetes/sdnc/resources/config/conf/lcm-dg.properties | 8 |
2 files changed, 24 insertions, 10 deletions
diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh index 9d1ab768fb..d1b0c995d5 100755 --- a/kubernetes/sdnc/resources/config/bin/startODL.sh +++ b/kubernetes/sdnc/resources/config/bin/startODL.sh @@ -86,6 +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} +DBINIT_DIR=${DBINIT_DIR:-/opt/opendaylight/current/daexim} # # Wait for database to init properly @@ -98,15 +99,15 @@ do done echo -e "\nmysql ready" -if [ ! -f ${SDNC_HOME}/.installed ] +if [ ! -d ${DBINIT_DIR} ] +then + mkdir -p ${DBINIT_DIR} +fi + +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 @@ -114,7 +115,18 @@ 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`" > ${SDNC_HOME}/.installed fi diff --git a/kubernetes/sdnc/resources/config/conf/lcm-dg.properties b/kubernetes/sdnc/resources/config/conf/lcm-dg.properties index 5d51118812..f91c62c98b 100644 --- a/kubernetes/sdnc/resources/config/conf/lcm-dg.properties +++ b/kubernetes/sdnc/resources/config/conf/lcm-dg.properties @@ -22,9 +22,11 @@ restapi.templateDir=/opt/onap/sdnc/restapi/templates #RESTCONF lcm.restconf.configscaleout.templatefile=lcm-restconf-configscaleout.json lcm.restconf.configscaleout.urlpath=/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin/vdns-instances/vdns-instance/ -lcm.restconf.configscaleout.geturlpath=/restconf/config/vlb-business-vnf-onap-plugin:vlb-business-vnf-onap-plugin -lcm.restconf.configscaleout.user= -lcm.restconf.configscaleout.password= +lcm.restconf.configscaleout.geturlpath=/restconf/operational/health-vnf-onap-plugin:health-vnf-onap-plugin-state/health-check +lcm.restconf.configscaleout.user=admin +lcm.restconf.configscaleout.password=admin +lcm.restconf.user=admin +lcm.restconf.password=admin lcm.restconf.port=8183 #DMAAP |