diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/sdnc/src/main/resources/blueprint-processor.data.dump | 8 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/scripts/startODL.sh | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/installation/sdnc/src/main/resources/blueprint-processor.data.dump b/installation/sdnc/src/main/resources/blueprint-processor.data.dump index 5fd53cbd..9a19863c 100644 --- a/installation/sdnc/src/main/resources/blueprint-processor.data.dump +++ b/installation/sdnc/src/main/resources/blueprint-processor.data.dump @@ -4,10 +4,10 @@ SET FOREIGN_KEY_CHECKS=0; -DROP TABLE sdnctl.CONFIG_RESOURCE_ASSIGNMENT_DATA; -DROP TABLE sdnctl.CONFIG_RESOURCE; -DROP TABLE sdnctl.CONFIG_RESOURCE_RELATION; -DROP TABLE sdnctl.CONFIG_TRANSACTION_LOG; +DROP TABLE IF EXISTS sdnctl.CONFIG_RESOURCE_ASSIGNMENT_DATA; +DROP TABLE IF EXISTS sdnctl.CONFIG_RESOURCE; +DROP TABLE IF EXISTS sdnctl.CONFIG_RESOURCE_RELATION; +DROP TABLE IF EXISTS sdnctl.CONFIG_TRANSACTION_LOG; SET FOREIGN_KEY_CHECKS=1; diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 02fb888a..9a795cab 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -79,6 +79,7 @@ MYSQL_PASSWD=${MYSQL_PASSWD:-openECOMP1.0} ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false} IS_PRIMARY_CLUSTER=${IS_PRIMARY_CLUSTER:-false} MY_ODL_CLUSTER=${MY_ODL_CLUSTER:-127.0.0.1} +INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} # # Wait for database @@ -91,7 +92,12 @@ do done echo -e "\nmysql ready" -if [ ! -f ${SDNC_HOME}/.installed ] +if [ ! -d ${INSTALLED_DIR} ] +then + mkdir -p ${INSTALLED_DIR} +fi + +if [ ! -f ${INSTALLED_DIR}/.installed ] then echo "Installing SDN-C database" ${SDNC_HOME}/bin/installSdncDb.sh @@ -108,7 +114,7 @@ then if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi - echo "Installed at `date`" > ${SDNC_HOME}/.installed + echo "Installed at `date`" > ${INSTALLED_DIR}/.installed fi exec ${ODL_HOME}/bin/karaf server |