From ed64b5edff15e702493df21aa3230b81593e6133 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Fri, 9 Jun 2017 03:19:04 +0300 Subject: [SDC-29] catalog 1707 rebase commit. Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1 Signed-off-by: Michael Lando --- .../heat-types/contrailCompute/contrailCompute.yml | 11 ++--------- .../heat-types/contrailCompute/contrailCompute.zip | Bin 781 -> 786 bytes 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute') diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml index d6ad4f953c..c2ba70e2d1 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.yml @@ -1,14 +1,7 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 -metadata: - template_name: ContrailComputeGlobalTypes - template_version: 1.0.0 -description: Contrail Compute TOSCA Global Types -imports: - common_definitions: - file: CommonGlobalTypesServiceTemplate.yaml node_types: org.openecomp.resource.vfc.nodes.heat.contrail.Compute: - derived_from: tosca.nodes.Compute + derived_from: org.openecomp.resource.vfc.nodes.Compute properties: flavor: type: string @@ -86,4 +79,4 @@ node_types: status: type: string description: status of the compute - status: SUPPORTED \ No newline at end of file + status: SUPPORTED diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip index c9e3c8a062..c0cc411e5d 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/contrailCompute/contrailCompute.zip differ -- cgit 1.2.3-korg