X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fvid%2Ftemplates%2Fdeployment.yaml;h=3a7bdcaa43f7cc162f615086b3013a0f4adfcc53;hb=1af5fbeb9f212a544a3230f0ad1a7a7bfd990338;hp=89ed734dfb1b65ce2ec18939cf3c047816df52a0;hpb=7963e804749c3e9aac77ad98baef80a3b8f9d018;p=oom.git

diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 89ed734dfb..3a7bdcaa43 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -31,11 +31,18 @@ spec:
         release: {{ .Release.Name }}
     spec:
       initContainers:
+#dd775k: This container checks if the job that wait for all db instances to be up and initializes the db had finished.
+#      - command:
+#        - /bin/sh
+#        args:
+#        - "-c"
+#        - "sleep 1000000000m"
       - command:
-        - /root/ready.py
+        - python
         args:
-        - --container-name
-        - {{ .Values.mariadb.nameOverride }}
+        - /tmp/vid-check-job-completion/vid_check_job_completion.py
+        - --job-name
+        - vid-config-galera
         env:
         - name: NAMESPACE
           valueFrom:
@@ -45,9 +52,12 @@ spec:
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
+        volumeMounts:
+        - mountPath: /tmp/vid-check-job-completion
+          name: vid-check-job-completion
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           lifecycle:
             postStart:
@@ -71,19 +81,19 @@ spec:
             periodSeconds: {{ .Values.readiness.periodSeconds }}
           env:
             - name: ASDC_CLIENT_REST_HOST
-              value: sdc-be.{{ include "common.namespace" . }}-sdc
+              value: sdc-be.{{ include "common.namespace" . }}
             - name: ASDC_CLIENT_REST_AUTH
               value: "{{ .Values.config.asdcclientrestauth }}"
             - name: ASDC_CLIENT_REST_PORT
               value: "{{ .Values.config.asdcclientrestport }}"
             - name: VID_AAI_HOST
-              value: aai-service.{{ include "common.namespace" . }}-aai
+              value: aai.{{ include "common.namespace" . }}
             - name: VID_AAI_PORT
               value: "{{ .Values.config.vidaaiport }}"
             - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
-              value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/context
+              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/context
             - name: VID_MSO_SERVER_URL
-              value: http://mso.{{ include "common.namespace" . }}-mso:"{{ .Values.config.msoport }}"
+              value: https://so.{{ include "common.namespace" . }}:{{ .Values.config.msoport }}
             - name: VID_MSO_PASS
               value: "{{ .Values.config.vidmsopass }}"
             - name: MSO_DME2_SERVER_URL
@@ -91,13 +101,13 @@ spec:
             - name: MSO_DME2_ENABLED
               value: {{ .Values.global.debugEnabled | default .Values.debugEnabled | quote }}
             - name: VID_ECOMP_REDIRECT_URL
-              value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/login.h\tm
+              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/login.htm
             - name: VID_ECOMP_REST_URL
-              value: http://portalapps.{{ include "common.namespace" . }}-portal:"{{ .Values.config.onapport }}"/ONAPPORTAL/auxapi
+              value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/auxapi
             - name: VID_CONTACT_US_LINK
               value: "{{ .Values.config.vidcontactuslink }}"
             - name: VID_UEB_URL_LIST
-              value: dmaap.{{ include "common.namespace" . }}-message-router
+              value: message-router.{{ include "common.namespace" . }}
             - name: VID_MYSQL_HOST
               value: "{{ .Values.config.vidmysqlhost }}"
             - name: VID_MYSQL_PORT
@@ -107,10 +117,9 @@ spec:
             - name: VID_MYSQL_USER
               value: "{{ .Values.config.vidmysqluser }}"
             - name: VID_MYSQL_PASS
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "common.fullname" . }}
-                  key: vid-password
+              value: "{{ .Values.config.vidmysqlpassword }}"
+              #valueFrom:
+              #  secretKeyRef: {name: {{ include "common.fullname" . }}, key: vid-password}
             - name: VID_MYSQL_MAXCONNECTIONS
               value: "{{ .Values.config.vidmysqlmaxconnections }}"
           volumeMounts:
@@ -158,5 +167,10 @@ spec:
         - name: vid-logback
           configMap:
             name: {{ include "common.fullname" . }}-log-configmap
+        - name: vid-check-job-completion
+          configMap:
+            name: {{ include "common.fullname" . }}-check-job-completion
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
+
+