For non-XOS charts, use a global registry var, split docker image name/tag/pullPolicy

Change-Id: Icffc569e2c152e0b413f4c7b7d9a546bd9a3ef58
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index 415ecff..f463c1d 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -45,8 +45,8 @@
       serviceAccountName: {{ .Values.serviceAccountName }}
       containers:
         - name: {{ .Chart.Name }}
-          image: {{ .Values.onosImage }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image:  "{{ .Values.global.registry }}{{ .Values.images.onos.repository }}:{{ tpl .Values.images.onos.tag . }}"
+          imagePullPolicy: {{ .Values.images.onos.pullPolicy }}
           command: ["./bin/onos-service", "server", "debug"]
           env:
 {{ toYaml .Values.onos_env | indent 12 }}