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-profiles/att-workflow/templates/tosca-configmap.yaml b/xos-profiles/att-workflow/templates/tosca-configmap.yaml
index 979b875..5c50ee6 100644
--- a/xos-profiles/att-workflow/templates/tosca-configmap.yaml
+++ b/xos-profiles/att-workflow/templates/tosca-configmap.yaml
@@ -27,10 +27,8 @@
{{ include "volt.serviceTosca" .Values.volt | indent 4 }}
040-fabric-crossconnect-service.yaml: |
{{ include "fabric-crossconnect.serviceTosca" (index .Values "fabric-crossconnect") | indent 4 }}
- 060-onos-service-fabric.yaml: |
-{{ include "onos-service.fabricAppTosca" (index .Values "onos-service") | indent 4 }}
- 061-onos-voltha-service-fabric.yaml: |
-{{ include "onos-service.volthaOnosTosca" (index .Values "onos-service") | indent 4 }}
+ 061-onos-service.yaml: |
+{{ include "att-workflow.onosTosca" .Values | indent 4 }}
070-fabric-service.yaml: |
{{ include "fabric.serviceTosca" .Values.fabric | indent 4 }}
080-workflow-service.yaml: |