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

This reverts commit 1f58c2afbd680c8c618bff6f66e9982515dd1caf.

Change-Id: I0d7ef37a420168276472675b005482d6d11daabd
diff --git a/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml b/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
index 7e9c65c..0a05d11 100644
--- a/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
+++ b/xos-profiles/demo-simpleexampleservice/templates/tosca-job.yaml
@@ -35,8 +35,8 @@
       restartPolicy: OnFailure
       containers:
         - name: {{ .Chart.Name }}-tosca-loader
-          image: {{ .Values.global.registry }}{{ .Values.image.repository }}:{{ tpl .Values.image.tag . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          image: {{ tpl .Values.tosca_loaderImage . | quote }}
+          imagePullPolicy: {{ .Values.imagePullPolicy }}
           env:
             - name: XOS_USER
               value: {{ .Values.xosAdminUser }}