Code Review
/
ccsdk
/
distribution.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix odl patches
[ccsdk/distribution.git]
/
odlsli
/
src
/
main
/
scripts
/
startODL.sh
diff --git
a/odlsli/src/main/scripts/startODL.sh
b/odlsli/src/main/scripts/startODL.sh
index
4d60857
..
d9c20cf
100644
(file)
--- a/
odlsli/src/main/scripts/startODL.sh
+++ b/
odlsli/src/main/scripts/startODL.sh
@@
-25,23
+25,26
@@
# Install SDN-C platform components if not already installed and start container
ODL_HOME=${ODL_HOME:-/opt/opendaylight}
# Install SDN-C platform components if not already installed and start container
ODL_HOME=${ODL_HOME:-/opt/opendaylight}
-ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+#ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U}
+ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-admin}
CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
SLEEP_TIME=${SLEEP_TIME:-120}
CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk}
SLEEP_TIME=${SLEEP_TIME:-120}
-MYSQL_PASSWD=${MYSQL_PASSWD:-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
#
#
# Wait for database
#
-echo
"Waiting for mysql
"
-until mysql -h
dbhost -u root -p${MYSQL_PASSW
D} mysql &> /dev/null
+echo
-e "\nWaiting for mysql:(${MYSQL_HOST})
"
+until mysql -h
${MYSQL_HOST} -u root -p${MYSQL_ROOT_PASSWOR
D} mysql &> /dev/null
do
printf "."
do
printf "."
- sleep 1
+ sleep 1
0
done
done
-echo -e "\nmysql ready"
+echo -e "\nmysql:(${MYSQL_HOST}) is ready."
+
if [ ! -d ${INSTALLED_DIR} ]
then
if [ ! -d ${INSTALLED_DIR} ]
then