commit 1f58c2afbd680c8c618bff6f66e9982515dd1caf
author Zack Williams <zdw@opennetworking.org> Fri Sep 28 09:43:43 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Thu Oct 04 09:19:52 2018 -0700
tree 6ac191faf324ef156eee13e74539267d9cc7d54e
parent 6cdd0a57a853b335482551f897c38858ac6805d7

XOS/NEM charts, use a global registry var, split docker image name/tag/pullPolicy

Change-Id: I6dc4bd70fcaf230d019dda871c2d8c4cfb92c7e7

xos-profiles/base-openstack/templates/tosca-job.yaml

diff --git a/xos-profiles/base-openstack/templates/tosca-job.yaml b/xos-profiles/base-openstack/templates/tosca-job.yaml
index 0b009e3..48d0b9e 100644
--- a/xos-profiles/base-openstack/templates/tosca-job.yaml
+++ b/xos-profiles/base-openstack/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ tpl .Values.tosca_loaderImage . | quote }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}