Merge "[CORD-3022] Splitting config in MCORD services"
diff --git a/xos-profiles/base-openstack/templates/_tosca.tpl b/xos-profiles/base-openstack/templates/_tosca.tpl
index e580a8a..098dcd5 100644
--- a/xos-profiles/base-openstack/templates/_tosca.tpl
+++ b/xos-profiles/base-openstack/templates/_tosca.tpl
@@ -49,6 +49,7 @@
 imports:
    - custom_types/onosapp.yaml
    - custom_types/onosservice.yaml
+   - custom_types/servicedependency.yaml
    - custom_types/servicegraphconstraint.yaml
    - custom_types/serviceinstance.yaml
    - custom_types/serviceinstancelink.yaml
diff --git a/xos-services/onos-service/templates/_tosca.tpl b/xos-services/onos-service/templates/_tosca.tpl
index e801ccf..62fe105 100644
--- a/xos-services/onos-service/templates/_tosca.tpl
+++ b/xos-services/onos-service/templates/_tosca.tpl
@@ -72,12 +72,33 @@
           rest_hostname: onos-cord-ui
           rest_port: 8181
 
+    onos_app#openflow-base:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: org.onosproject.openflow-base
+        app_id: org.onosproject.openflow-base
+      requirements:
+        - owner:
+            node: service#ONOS_CORD
+            relationship: tosca.relationships.BelongsToOne
+
+    onos_app#dhcp:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: org.onosproject.dhcp
+        app_id: org.onosproject.dhcp
+      requirements:
+        - owner:
+            node: service#ONOS_CORD
+            relationship: tosca.relationships.BelongsToOne
+
     onos_app#cord-config:
       type: tosca.nodes.ONOSApp
       properties:
         name: cord-config
         url: {{ .cordConfigAppURL }}
         version: 1.4.0
+        dependencies: org.onosproject.openflow-base, org.onosproject.dhcp
       requirements:
         - owner:
             node: service#ONOS_CORD