Commit c5176c69 authored by vegall's avatar vegall Committed by garciadeblas
Browse files

Feature 11032: Integration of OSM Helm Chart with different databases 



Change-Id: I9ec6fc5f6ae42be8c506bff54302c3c1771bee7e
Signed-off-by: default avatarLuis Vega <lvega@whitestack.com>
parent c09bd23f

installers/helm/osm/templates/_helpers.tpl

+13 −0
Original line number Diff line number Diff line
@@ -109,3 +109,16 @@ Create the name of the images to be used 
{{ define "osm.keystone.image" -}}

{{ printf "%s:%s" (.Values.keystone.image.repository | default (printf "%s/keystone" (.Values.global.image.repositoryBase))) (.Values.keystone.image.tag | default .Values.global.image.tag) }}

{{- end }}



{{/*

Return the MongoDB URI based on whether authentication is enabled.

*/}}

{{- define "osm.databaseUri" -}}

  {{- if .Values.global.db.mongo.auth.enabled }}

    {{- $secret := (lookup "v1" "Secret" .Release.Namespace .Values.global.db.mongo.auth.secretName ) }}

    {{- $password := (index $secret.data .Values.global.db.mongo.auth.secretKeyRootPassword ) | b64dec }}

    {{ printf "mongodb://root:%s@%s:27017/?replicaSet=rs0" $password .Values.global.db.mongo.mongoService | b64enc | quote }}

  {{- else }}

    {{ printf "mongodb://%s:27017/?replicaSet=rs0" .Values.global.db.mongo.mongoService | b64enc | quote }}

  {{- end }}

{{- end }}

installers/helm/osm/templates/keystone/keystone-configmap.yaml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ metadata: 
  labels:

    {{- include "osm.labels" . | nindent 4 }}

data:

  DB_HOST: "mysql"

  DB_HOST: "{{ .Values.global.db.mysql.mysqlService }}"

{{- end }}
 
 No newline at end of file

installers/helm/osm/templates/keystone/keystone-deployment.yaml

+2 −2
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ spec: 
            - name: ROOT_DB_PASSWORD

              valueFrom:

                secretKeyRef:

                  name: mysql

                  key: mysql-root-password

                  name: {{  .Values.global.db.mysql.mysqlSecretName }}

                  key: {{ .Values.global.db.mysql.mysqlSecretKey }}

            - name: KEYSTONE_DB_PASSWORD

              valueFrom:

                secretKeyRef:

installers/helm/osm/templates/lcm/lcm-configmap.yaml

+0 −2
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ metadata: 
    {{- include "osm.labels" . | nindent 4 }}

data:

  OSMLCM_RO_HOST: "ro"

  OSMLCM_DATABASE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0"

  OSMLCM_MESSAGE_HOST: "kafka"

  OSMLCM_STORAGE_DRIVER: "mongo"

  OSMLCM_STORAGE_PATH: "/app/storage"

  OSMLCM_STORAGE_COLLECTION: "files"

  OSMLCM_STORAGE_URI: "mongodb://mongodb-k8s:27017/?replicaSet=rs0"

  OSMLCM_GLOBAL_LOGLEVEL: {{ .Values.lcm.logLevel | default .Values.global.logLevel | default "INFO" }}

  OSMLCM_MAINPOSTRENDERERPATH: "{{ .Values.lcm.mainPostRenderer.path }}{{ .Values.lcm.mainPostRenderer.scriptName }}"

  OSMLCM_PODLABELSPOSTRENDERERPATH: "{{ .Values.lcm.podLabelsPostRenderer.path }}{{ .Values.lcm.podLabelsPostRenderer.scriptName }}"

installers/helm/osm/templates/lcm/lcm-deployment.yaml

+11 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ spec: 
      initContainers:

        - name: kafka-ro-mongo-test

          image: alpine:latest

          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 ro 9090 && nc -zvw1 mongodb-k8s 27017); do sleep 3; done; exit 0"]

          command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 ro 9090 && nc -zvw1 {{ .Values.global.db.mongo.mongoService }} 27017); do sleep 3; done; exit 0"]

      containers:

        - name: lcm

          securityContext:
@@ -99,6 +99,16 @@ spec: 
                secretKeyRef:

                  name: {{ include "osm.fullname" . }}-secret

                  key: OSM_DATABASE_COMMONKEY

            - name: OSMLCM_DATABASE_URI

              valueFrom:

                secretKeyRef:

                  name: {{ include "osm.fullname" . }}-secret

                  key: OSM_DATABASE_URI

            - name: OSMLCM_STORAGE_URI

              valueFrom:

                secretKeyRef:

                  name: {{ include "osm.fullname" . }}-secret

                  key: OSM_DATABASE_URI

            {{- end }}

          {{- end }}

          volumeMounts: