Feature 11032: Integration of OSM Helm Chart with different databases

[osm/devops.git] / installers / helm / osm / templates / ro / ro-deployment.yaml

diff --git a/installers/helm/osm/templates/ro/ro-deployment.yaml b/installers/helm/osm/templates/ro/ro-deployment.yaml
index 6ae8f8a..902b5fd 100644 (file)
--- a/installers/helm/osm/templates/ro/ro-deployment.yaml
+++ b/installers/helm/osm/templates/ro/ro-deployment.yaml
@@ -47,7 +47,7 @@ spec:
       initContainers:
         - name: kafka-mongo-test
           image: alpine:latest
-          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]
+          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 {{ .Values.global.db.mongo.mongoService }} 27017); do sleep 3; done; exit 0"]
       containers:
         - name: ro
           securityContext:
@@ -78,6 +78,16 @@ spec:
                 secretKeyRef:
                   name: {{ include "osm.fullname" . }}-secret
                   key: OSM_DATABASE_COMMONKEY
+            - name: OSMRO_DATABASE_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "osm.fullname" . }}-secret
+                  key: OSM_DATABASE_URI
+            - name: OSMRO_STORAGE_URI
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "osm.fullname" . }}-secret
+                  key: OSM_DATABASE_URI
           {{- end }}
       {{- with .Values.global.nodeSelector }}
       nodeSelector: