SEBA-147: Consolidate multiple ONi into a single ONOS

Also moved the TOSCA for ONOS apps and configuration to
the att-workflow chart rather than having
deployment-specific TOSCA in the ONOS service chart.

Change-Id: Ic835b4eced96d85b55a841fdd6d8d0baaf7b368a
diff --git a/xos-services/volt/templates/_tosca.tpl b/xos-services/volt/templates/_tosca.tpl
index fd7e406..9666e06 100644
--- a/xos-services/volt/templates/_tosca.tpl
+++ b/xos-services/volt/templates/_tosca.tpl
@@ -27,9 +27,9 @@
       properties:
         name: volt
         kind: data
-        voltha_url: voltha.voltha.svc.cluster.local
+        voltha_url: {{ .volthaRestService | quote }}
         voltha_port: 8882
-        onos_voltha_url: onos-voltha-ui.default.svc.cluster.local
+        onos_voltha_url: {{ .onosRestService | quote }}
         onos_voltha_port: 8181
         onos_voltha_user: karaf
         onos_voltha_pass: karaf