diff options
Diffstat (limited to 'kubernetes/sdnc')
| -rwxr-xr-x | kubernetes/sdnc/resources/config/bin/createLinks.sh | 11 | ||||
| -rwxr-xr-x | kubernetes/sdnc/resources/config/bin/installSdncDb.sh | 4 | ||||
| -rw-r--r-- | kubernetes/sdnc/templates/statefulset.yaml | 1 |
3 files changed, 3 insertions, 13 deletions
diff --git a/kubernetes/sdnc/resources/config/bin/createLinks.sh b/kubernetes/sdnc/resources/config/bin/createLinks.sh index 1999dabb37..52c40723f9 100755 --- a/kubernetes/sdnc/resources/config/bin/createLinks.sh +++ b/kubernetes/sdnc/resources/config/bin/createLinks.sh @@ -27,11 +27,6 @@ then MDSAL_PATH=/opt/opendaylight/mdsal fi -if [ "$DAEXIM_PATH" = "" ] -then - DAEXIM_PATH=/opt/opendaylight/daexim -fi - if [ "$JOURNAL_PATH" = "" ] then JOURNAL_PATH=/opt/opendaylight/journal @@ -42,12 +37,6 @@ then SNAPSHOTS_PATH=/opt/opendaylight/snapshots fi - -if [ ! -L $DAEXIM_PATH ] -then - ln -s $MDSAL_PATH/daexim $DAEXIM_PATH -fi - if [ ! -L $JOURNAL_PATH ] then if [ -d $JOURNAL_PATH ] diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh index 11ed7f45bf..42abf54444 100755 --- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh +++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh @@ -37,8 +37,8 @@ SDNC_DB_DATABASE=${SDNC_DB_DATABASE} # Create tablespace and user account mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} mysql <<-END CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE}; -CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; -CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; +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; diff --git a/kubernetes/sdnc/templates/statefulset.yaml b/kubernetes/sdnc/templates/statefulset.yaml index 96fa3378fb..48776c9961 100644 --- a/kubernetes/sdnc/templates/statefulset.yaml +++ b/kubernetes/sdnc/templates/statefulset.yaml @@ -116,6 +116,7 @@ spec: - | mkdir {{ .Values.persistence.mdsalPath }}/journal mkdir {{ .Values.persistence.mdsalPath }}/snapshots + mkdir {{ .Values.persistence.mdsalPath }}/daexim chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.persistence.mdsalPath }} {{- if .Values.global.aafEnabled }} chown -R {{ .Values.config.odlUid }}:{{ .Values.config.odlGid}} {{ .Values.certInitializer.credsPath }} |