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/voltha/values.yaml b/voltha/values.yaml
index 700149f..a6743fa 100644
--- a/voltha/values.yaml
+++ b/voltha/values.yaml
@@ -92,7 +92,7 @@
 - "/ofagent/ofagent/main.py"
 - "-v"
 - "--consul=consul.$(NAMESPACE).svc.cluster.local:8500"
-- "--controller=onos-voltha-openflow.default.svc.cluster.local:6653"
+- "--controller=onos-openflow.default.svc.cluster.local:6653"
 - "--grpc-endpoint=vcore.$(NAMESPACE).svc.cluster.local:50556"
 
 netconf_args: