X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fcharts%2Foof-has%2Ftemplates%2Fjob-onboard.yaml;h=22cb5a17eb7738435194b56761b0c78a44904239;hb=2f987f69b45998da0ff21fd7dc14d18206352507;hp=a27e190385eda3b7044b9e35135229993e7eddd2;hpb=ed5332247d2d3f7ccd647995297e54ef500db2b5;p=oom.git

diff --git a/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml b/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml
index a27e190385..22cb5a17eb 100755
--- a/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml
+++ b/kubernetes/oof/charts/oof-has/templates/job-onboard.yaml
@@ -22,7 +22,7 @@ metadata:
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
@@ -30,17 +30,17 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       initContainers:
-      - image:  "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+      - image:  "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
         command:
-        - /root/ready.py
+        - /app/ready.py
         args:
         - --container-name
-        - "music-tomcat"
+        - "music-springboot"
         - --container-name
         - "music-cassandra"
         env:
@@ -50,17 +50,17 @@ spec:
               apiVersion: v1
               fieldPath: metadata.namespace
       - command:
-        - /root/job_complete.py
+        - /app/ready.py
         args:
         - -j
-        - "{{ .Release.Name }}-music-cassandra-job-config"
+        - "{{ include "common.release" . }}-music-cassandra-job-config"
         env:
         - name: NAMESPACE
           valueFrom:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        image: "{{ include "common.repository" . }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-music-db-readiness
       containers:
@@ -71,10 +71,7 @@ spec:
           - "/bin/sh"
           - "-c"
           - |
-             curl -X POST http://{{.Values.config.music.serviceName}}.{{ include "common.namespace" . }}:{{.Values.config.music.port}}/MUSIC/rest/v2/admin/onboardAppWithMusic \
-             -H "Content-Type: application/json" \
-             -H "Authorization: Basic Y29uZHVjdG9yOmMwbmR1Y3Qwcg==" \
-             --data @onboard.json
+             echo "job-onboard"
         workingDir: /has
         volumeMounts:
           - mountPath: /etc/localtime