diff options
| author |   Singal, Kapil (ks220y) <ks220y@att.com> | 2021-02-18 12:52:50 -0500 |
|---|---|---|
| committer | KAPIL SINGAL <ks220y@att.com> | 2021-02-18 21:54:20 +0000 |
| commit | 7295af14d96885845fe651de1f3c546127ad3dc6 (patch) | |
| tree | 174dfa97e477063a5375d13fa11bde13b1a3d098 /odlsli/src/main/scripts | |
| parent | 1860bfa149f88c0a99bcd70d46f5717e7bf945c8 (diff) | |
Enhacing ODL-SLI startODL.sh and installSdncDb.sh
Fixing odlsli.dump [Segmentation fault (core dumped)]
Issue-ID: CCSDK-3173
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: I5054b086170e3cc6cf7d714d144c4170459d1c7e
Diffstat (limited to 'odlsli/src/main/scripts')
| -rw-r--r-- | odlsli/src/main/scripts/installSdncDb.sh | 20 | ||||
| -rw-r--r-- | odlsli/src/main/scripts/startODL.sh | 14 |
2 files changed, 20 insertions, 14 deletions
diff --git a/odlsli/src/main/scripts/installSdncDb.sh b/odlsli/src/main/scripts/installSdncDb.sh index fb97b073..46fc393b 100644 --- a/odlsli/src/main/scripts/installSdncDb.sh +++ b/odlsli/src/main/scripts/installSdncDb.sh @@ -2,7 +2,7 @@ ### # ============LICENSE_START======================================================= -# openECOMP : SDN-C +# ONAP : SDN-C # ================================================================================ # Copyright (C) 2017 AT&T Intellectual Property. All rights # reserved. @@ -22,24 +22,28 @@ ### CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} +MYSQL_HOST=${MYSQL_HOST:-dbhost} MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} -SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma} +SDNC_DB_PASSWORD=${SDNC_DB_PASSWORD:-gamma} SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl} - +echo -e "\nCreating database:($SDNC_DB_DATABASE) and user:($SDNC_DB_USER)" # Create tablespace and user account -mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWORD} mysql <<-END -CREATE DATABASE ${SDNC_DB_DATABASE}; -CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}'; -CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}'; +mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} mysql <<-END +CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE}; +CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; +CREATE USER IF NOT EXISTS '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION; +flush privileges; commit; END +# load schema if [ -f ${CCSDK_HOME}/data/odlsli.dump ] then -mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWD} sdnctl < ${CCSDK_HOME}/data/odlsli.dump + mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} ${SDNC_DB_DATABASE} < ${CCSDK_HOME}/data/odlsli.dump + echo -e "\n ${SDNC_DB_DATABASE} schema loaded." fi diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh index 310acfd7..d9387246 100644 --- a/odlsli/src/main/scripts/startODL.sh +++ b/odlsli/src/main/scripts/startODL.sh @@ -28,20 +28,22 @@ ODL_HOME=${ODL_HOME:-/opt/opendaylight} ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U} CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} SLEEP_TIME=${SLEEP_TIME:-120} -MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} -INSTALLED_DIR=${INSTALLED_FILE:-/opt/opendaylight/current/daexim} +INSTALLED_DIR=${INSTALLED_FILE:-${ODL_HOME}/current/daexim} +MYSQL_HOST=${MYSQL_HOST:-dbhost} +MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-openECOMP1.0} # # Wait for database # -echo "Waiting for mysql" -until mysql -h dbhost -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null +echo -e "\nWaiting for mysql:(${MYSQL_HOST})" +until mysql -h ${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWORD} mysql &> /dev/null do printf "." - sleep 1 + sleep 10 done -echo -e "\nmysql ready" +echo -e "\nmysql:(${MYSQL_HOST}) is ready." + if [ ! -d ${INSTALLED_DIR} ] then |