X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Foof%2Fcharts%2Foof-has%2Ftemplates%2Fjob-onboard.yaml;h=ad42a1fe08463f0ae240106bf80b7ed0b4e40666;hb=08d7b637aa40344d12daa7d4f9e4e9fff8d15e17;hp=2b24d4017dd85ed2217780620b91e5aa274c3f58;hpb=cb19fea6d92795f6dffb6cd51ef5dcd7d7419f3c;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 2b24d4017d..ad42a1fe08 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,7 +30,7 @@ spec:
     metadata:
       labels:
         app: {{ include "common.name" . }}
-        release: {{ .Release.Name }}
+        release: {{ include "common.release" . }}
     spec:
       initContainers:
       - image:  "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
@@ -40,7 +40,7 @@ spec:
         - /root/ready.py
         args:
         - --container-name
-        - "music-tomcat"
+        - "music-springboot"
         - --container-name
         - "music-cassandra"
         env:
@@ -53,7 +53,7 @@ spec:
         - /root/job_complete.py
         args:
         - -j
-        - "{{ .Release.Name }}-music-cassandra-job-config"
+        - "{{ include "common.release" . }}-music-cassandra-job-config"
         env:
         - name: NAMESPACE
           valueFrom:
@@ -65,16 +65,13 @@ spec:
         name: {{ include "common.name" . }}-music-db-readiness
       containers:
       - image: "{{ include "common.repository" . }}/{{ .Values.global.image.optf_has }}"
-        imagePullPolicy: {{ .Values.pullPolicy }}
+        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-onboard
         command:
           - "/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
@@ -105,4 +102,4 @@ spec:
             path: onboard.json
       restartPolicy: OnFailure
       imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"