[CORD-2349] Migrating REM-CORD

Change-Id: Iae573428e3bee89026262055263f24a32dd12183
diff --git a/roles/cord-profile/templates/deployment.yaml.j2 b/roles/cord-profile/templates/deployment.yaml.j2
index c572e54..e7cb060 100644
--- a/roles/cord-profile/templates/deployment.yaml.j2
+++ b/roles/cord-profile/templates/deployment.yaml.j2
@@ -19,7 +19,8 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 
 imports:
-   - custom_types/xos.yaml
+   - custom_types/deployment.yaml
+   - custom_types/flavor.yaml
 
 description: deployment config, generated by platform-install
 
@@ -31,16 +32,21 @@
 {% for flavor in deployment_flavors %}
     {{ flavor }}:
       type: tosca.nodes.Flavor
-
+      properties:
+        name: {{ flavor }}
+        must-exist: true
 {% endfor %}
 
 # Deployment
     {{ deployment_type }}:
       type: tosca.nodes.Deployment
-      requirements:
-{% for flavor in deployment_flavors %}
-        - {{ flavor }}:
-            node: {{ flavor }}
-            relationship: tosca.relationships.SupportsFlavor
+      properties:
+        name: {{ deployment_type }}
+# NOTE look that this are outdated and not used anymore
+#     requirements:
+# {% for flavor in deployment_flavors %}
+#         - {{ flavor }}:
+#             node: {{ flavor }}
+#             relationship: tosca.relationships.SupportsFlavor
 
-{% endfor %}
+# {% endfor %}