X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fmulticloud%2Fcomponents%2Fmulticloud-fcaps%2Ftemplates%2Fdeployment.yaml;fp=kubernetes%2Fmulticloud%2Fcharts%2Fmulticloud-fcaps%2Ftemplates%2Fdeployment.yaml;h=99d2314a07e5af69c457337098b0cbd9638f635f;hb=37dc40c21527d479daa838f18949c1da4151d987;hp=110f9aa84f7ebf41d0616c6debbd5f4065d0640c;hpb=f0dacd23777a7998915afe00150b25135b932f86;p=oom.git

diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
similarity index 94%
rename from kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
rename to kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
index 110f9aa84f..99d2314a07 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-fcaps/templates/deployment.yaml
@@ -67,7 +67,7 @@ spec:
          subPath: log.yml
        resources:
 {{ include "common.resources" . | indent 12 }}
-       image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+       image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        ports:
        - containerPort: {{ .Values.service.internalPort }}
@@ -86,7 +86,7 @@ spec:
          failureThreshold: {{ .Values.liveness.failureThreshold }}
        {{ end }}
      # side car containers
-     - image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+     - image: {{ include "repositoryGenerator.image.logging" . }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        name: filebeat-onap
        volumeMounts:
@@ -97,7 +97,7 @@ spec:
          name: fcaps-log
        - mountPath: /usr/share/filebeat/data
          name: fcaps-data-filebeat
-     - image: {{ .Values.rabbitmq }}
+     - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.rabbitmq }}
        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
        name: rabbit-mq