Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[COMMON] Add custom certs into AAF truststore"
[oom.git]
/
kubernetes
/
appc
/
resources
/
config
/
appc
/
opt
/
onap
/
appc
/
bin
/
startODL.sh
diff --git
a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index
25a5c31
..
85f5aac
100755
(executable)
--- a/
kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/
kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@
-30,7
+30,7
@@
#set -x
*/}}
#set -x
*/}}
-
function enable_odl_cluster()
{
+
enable_odl_cluster ()
{
if [ -z $APPC_REPLICAS ]; then
echo "APPC_REPLICAS is not configured in Env field"
exit
if [ -z $APPC_REPLICAS ]; then
echo "APPC_REPLICAS is not configured in Env field"
exit
@@
-65,7
+65,7
@@
DBINIT_DIR=${DBINIT_DIR:-/opt/opendaylight/current/daexim}
# Wait for database to init properly
#
echo "Waiting for mariadbgalera"
# Wait for database to init properly
#
echo "Waiting for mariadbgalera"
-until mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p${MYSQL_PASSWD} mysql
&> /dev/null
+until mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p${MYSQL_PASSWD} mysql
>/dev/null 2>&1
do
printf "."
sleep 1
do
printf "."
sleep 1
@@
-83,7
+83,7
@@
then
show databases like 'sdnctl';
END
)
show databases like 'sdnctl';
END
)
- if [ "x${sdnc_db_exists}" =
=
"x" ]
+ if [ "x${sdnc_db_exists}" = "x" ]
then
echo "Installing SDNC database"
${SDNC_HOME}/bin/installSdncDb.sh
then
echo "Installing SDNC database"
${SDNC_HOME}/bin/installSdncDb.sh
@@
-92,7
+92,7
@@
END
show databases like 'appcctl';
END
)
show databases like 'appcctl';
END
)
- if [ "x${appc_db_exists}" =
=
"x" ]
+ if [ "x${appc_db_exists}" = "x" ]
then
echo "Installing APPC database"
${APPC_HOME}/bin/installAppcDb.sh
then
echo "Installing APPC database"
${APPC_HOME}/bin/installAppcDb.sh