Merge "Moving dms_cli instructions and example update"

[ric-plt/ric-dep.git] / helm / dbaas / templates / configmap.yaml

diff --git a/helm/dbaas/templates/configmap.yaml b/helm/dbaas/templates/configmap.yaml
index 9f82b13..27b36a7 100644 (file)
--- a/helm/dbaas/templates/configmap.yaml
+++ b/helm/dbaas/templates/configmap.yaml
@@ -19,6 +19,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ template "common.configmapname.dbaas" . }}-config
+  namespace: {{ include "common.namespace.platform" . }}
   labels:
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
@@ -27,9 +28,15 @@ metadata:
 data:
   redis.conf: |
     dir "/data"
-    {{- range $key, $value := .Values.dbaas.redis.config }}
+{{- if $.Values.dbaas.enableHighAvailability }}
+    {{- range $key, $value := .Values.dbaas.redis.ha_config }}
+    {{ $key }} {{ $value }}
+    {{- end }}
+{{- else }}
+    {{- range $key, $value := .Values.dbaas.redis.sa_config }}
     {{ $key }} {{ $value }}
     {{- end }}
+{{- end }}
 
 {{- if $.Values.dbaas.enableHighAvailability }}
   sentinel.conf: |