summaryrefslogtreecommitdiffstats
path: root/components/model-catalog
diff options
context:
space:
mode:
authorSteve Siani <alphonse.steve.siani.djissitchi@ibm.com>2019-04-03 15:23:27 -0400
committerSteve Siani <alphonse.steve.siani.djissitchi@ibm.com>2019-04-09 13:08:39 -0400
commitf7d891db891f4fb8db103236d4010de1b7739378 (patch)
treec7a7fff4bca0ec2ac3536442463ad8494fd07196 /components/model-catalog
parentf2b17fe1579222ffc251d48bf9475dc3fcfc1206 (diff)
Jinja template for Blueprint template service
Change-Id: Iec777e4500c2a040faccc8375b1d2dd24c27cb7f Issue-ID: CCSDK-1193 Signed-off-by: Steve Siani <alphonse.steve.siani.djissitchi@ibm.com>
Diffstat (limited to 'components/model-catalog')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/artifact_types.json10
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.jinja (renamed from components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.vtl)0
-rw-r--r--components/model-catalog/definition-type/starter-type/artifact_type/artifact-template-jinja.json8
4 files changed, 19 insertions, 3 deletions
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.vtl b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Templates/another-template.jinja
index 026c59176..026c59176 100644
--- 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.jinja
diff --git a/components/model-catalog/definition-type/starter-type/artifact_type/artifact-template-jinja.json b/components/model-catalog/definition-type/starter-type/artifact_type/artifact-template-jinja.json
new file mode 100644
index 000000000..5d4fcc3f6
--- /dev/null
+++ b/components/model-catalog/definition-type/starter-type/artifact_type/artifact-template-jinja.json
@@ -0,0 +1,8 @@
+{
+ "description": " Jinja Template used for Configuration",
+ "version": "1.0.0",
+ "file_ext": [
+ "jinja"
+ ],
+ "derived_from": "tosca.artifacts.Implementation"
+} \ No newline at end of file