From f7d891db891f4fb8db103236d4010de1b7739378 Mon Sep 17 00:00:00 2001 From: Steve Siani Date: Wed, 3 Apr 2019 15:23:27 -0400 Subject: Jinja template for Blueprint template service Change-Id: Iec777e4500c2a040faccc8375b1d2dd24c27cb7f Issue-ID: CCSDK-1193 Signed-off-by: Steve Siani --- .../baseconfiguration/Definitions/activation-blueprint.json | 4 ++-- .../baseconfiguration/Definitions/artifact_types.json | 10 +++++++++- .../baseconfiguration/Templates/another-template.jinja | 1 + .../baseconfiguration/Templates/another-template.vtl | 1 - 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.jinja delete mode 100644 components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.vtl (limited to 'components/model-catalog/blueprint-model/test-blueprint') diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json index 78a9d8c69..eae69245b 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json @@ -173,8 +173,8 @@ "file": "Definitions/baseconfig-mapping.json" }, "another-template": { - "type": "artifact-template-velocity", - "file": "Templates/another-template.vtl" + "type": "artifact-template-jinja", + "file": "Templates/another-template.jinja" }, "another-mapping": { "type": "artifact-mapping-resource", diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/artifact_types.json index d741d151e..f1e5bb14f 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/artifact_types.json +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/artifact_types.json @@ -8,6 +8,14 @@ ], "derived_from": "tosca.artifacts.Implementation" }, + "artifact-template-jinja": { + "description": "Jinja Template used for Configuration", + "version": "1.0.0", + "file_ext": [ + "jinja" + ], + "derived_from": "tosca.artifacts.Implementation" + }, "artifact-mapping-resource": { "description": "Velocity Template Resource Mapping File used along with Configuration template", "version": "1.0.0", @@ -42,4 +50,4 @@ "derived_from": "tosca.artifacts.Implementation" } } -} \ No newline at end of file +} diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.jinja b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.jinja new file mode 100644 index 000000000..026c59176 --- /dev/null +++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.jinja @@ -0,0 +1 @@ +This is Sample Velocity Template \ No newline at end of file diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.vtl b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.vtl deleted file mode 100644 index 026c59176..000000000 --- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.vtl +++ /dev/null @@ -1 +0,0 @@ -This is Sample Velocity Template \ No newline at end of file -- cgit 1.2.3-korg