CORD-3225 fix m-cord profile validation issues

Change-Id: Ia15599b4176596cee89f18041c84a2109bf41633
diff --git a/xos-services/openstack/templates/_tosca.tpl b/xos-services/openstack/templates/_tosca.tpl
index 8f00dad..ad56d09 100644
--- a/xos-services/openstack/templates/_tosca.tpl
+++ b/xos-services/openstack/templates/_tosca.tpl
@@ -29,26 +29,31 @@
       type: tosca.nodes.Flavor
       properties:
         name: m1.tiny
+        flavor: m1.tiny
 
     m1.small:
       type: tosca.nodes.Flavor
       properties:
         name: m1.small
+        flavor: m1.small
 
     m1.medium:
       type: tosca.nodes.Flavor
       properties:
         name: m1.medium
+        flavor: m1.medium
 
     m1.large:
       type: tosca.nodes.Flavor
       properties:
         name: m1.large
+        flavor: m1.large
 
     m1.xlarge:
       type: tosca.nodes.Flavor
       properties:
         name: m1.xlarge
+        flavor: m1.xlarge
 {{- end -}}
 
 {{- define "openstack.networkTosca" -}}
diff --git a/xos-services/vtn-service/templates/_tosca.tpl b/xos-services/vtn-service/templates/_tosca.tpl
index c7f25b1..8777b24 100644
--- a/xos-services/vtn-service/templates/_tosca.tpl
+++ b/xos-services/vtn-service/templates/_tosca.tpl
@@ -32,7 +32,7 @@
       type: tosca.nodes.VTNService
       properties:
           name: vtn
-          kind: platform
+          kind: control
           privateGatewayMac: 00:00:00:00:00:01
           localManagementIp: 172.27.0.1/24
           ovsdbPort: 6641