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 "[DMAAP] DMaaP ServiceMesh compatibility"
[oom.git]
/
kubernetes
/
appc
/
resources
/
config
/
appc
/
opt
/
onap
/
ccsdk
/
bin
/
installSdncDb.sh
diff --git
a/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/installSdncDb.sh
b/kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/installSdncDb.sh
index
c3e6921
..
7257d18
100755
(executable)
--- a/
kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/installSdncDb.sh
+++ b/
kubernetes/appc/resources/config/appc/opt/onap/ccsdk/bin/installSdncDb.sh
@@
-1,4
+1,6
@@
-#!/bin/bash
+#!/bin/sh
+
+{{/*
###
# ============LICENSE_START=======================================================
###
# ============LICENSE_START=======================================================
@@
-21,13
+23,14
@@
# limitations under the License.
# ============LICENSE_END=========================================================
###
# limitations under the License.
# ============LICENSE_END=========================================================
###
+*/}}
SDNC_HOME=${SDNC_HOME:-/opt/onap/ccsdk}
MYSQL_PASSWD=${MYSQL_ROOT_PASSWORD}
SDNC_HOME=${SDNC_HOME:-/opt/onap/ccsdk}
MYSQL_PASSWD=${MYSQL_ROOT_PASSWORD}
-SDNC_DB_USER=${SDNC_DB_USER
:-sdnctl
}
-SDNC_DB_PASSWD=${SDNC_DB_PASSWD
:-gamma
}
-SDNC_DB_DATABASE=
${SDN_DB_DATABASE:-sdnctl
}
+SDNC_DB_USER=${SDNC_DB_USER}
+SDNC_DB_PASSWD=${SDNC_DB_PASSWD}
+SDNC_DB_DATABASE=
{{.Values.config.sdncdb.dbName}
}
# Create tablespace and user account
# Create tablespace and user account
@@
-42,5
+45,5
@@
END
if [ -f ${SDNC_HOME}/data/odlsli.dump ]
then
if [ -f ${SDNC_HOME}/data/odlsli.dump ]
then
-mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p${MYSQL_PASSWD}
sdnctl
< ${SDNC_HOME}/data/odlsli.dump
+mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p${MYSQL_PASSWD}
${SDNC_DB_DATABASE}
< ${SDNC_HOME}/data/odlsli.dump
fi
fi