diff options
| author |   Dan Timoney <dtimoney@att.com> | 2019-04-10 11:10:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-10 11:10:42 +0000 |
| commit | 5ef963fcebf2e97fc097837d3993ad0f66885568 (patch) | |
| tree | 104176070056e44f5a29350dbb3508e57b6c349f /components | |
| parent | 06cfd28140c6d30a5fda4e08c2f306b731f6647a (diff) | |
| parent | f7d891db891f4fb8db103236d4010de1b7739378 (diff) | |
Merge "Jinja template for Blueprint template service"
Diffstat (limited to 'components')
| -rw-r--r-- | components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json | 4 | ||||
| -rw-r--r-- | components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/artifact_types.json | 10 | ||||
| -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.json | 8 |
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 |