diff options
| author |   Tony Hansen <tony@att.com> | 2017-10-11 18:08:57 +0000 |
|---|---|---|
| committer | Tony Hansen <tony@att.com> | 2017-10-11 19:11:11 +0000 |
| commit | f5e39dd27dd12b4f90c39ea267a509eabe1cfe4c (patch) | |
| tree | 2a849df00d1b88bd63740303e53fbb4ce4f4371c /blueprints/pgaas-disk.yaml-template | |
| parent | 40ad979bae6afaa9d0fbee4ac71a9684e40f06f6 (diff) | |
fix inputs, template expander, add tests
rewrite the template expander:
1) faster
2) handle multiple line variables
3) add new ONAPTEMPLATE_STANDARD_INPUTS_TYPES variable
fix inputs directives in pgaas templates by using ONAPTEMPLATE_STANDARD_INPUTS_TYPES
add call to check-blueprint-vs-input to test_templates
Change-Id: I4ffc220d7e1f4820b271d055b5de3961ca236983
Signed-off-by: Tony Hansen <tony@att.com>
Issue-ID: DCAEGEN2-128
Signed-off-by: Tony Hansen <tony@att.com>
Diffstat (limited to 'blueprints/pgaas-disk.yaml-template')
| -rw-r--r-- | blueprints/pgaas-disk.yaml-template | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/pgaas-disk.yaml-template index 7fbe790..fc97893 100644 --- a/blueprints/pgaas-disk.yaml-template +++ b/blueprints/pgaas-disk.yaml-template @@ -44,29 +44,9 @@ imports: - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/pgaas_types.yaml" inputs: - # environment info blueprint_version: type: string default: 'VERSION-STAMP-GOES-HERE' - flavor_id: - type: string - key_filename: - type: string - keypair: - type: string - location_domain: - type: string - location_prefix: - type: string - openstack: {} - private_net: - type: string - public_net: - type: string - security_group: - type: string - ubuntu1604image_id: - type: string # pgaas-specific info pgaas_cluster_name: @@ -76,6 +56,8 @@ inputs: type: string default: 300 +{{ ONAPTEMPLATE_STANDARD_INPUTS_TYPES }} + node_templates: key_pair: type: cloudify.openstack.nodes.KeyPair @@ -87,7 +69,7 @@ node_templates: get_input: openstack sharedsshkey_pgrs: - type: dcae.nodes.ssh.keypair + type: ccsdk.nodes.ssh.keypair private_net: type: cloudify.openstack.nodes.Network @@ -137,5 +119,5 @@ node_templates: target: sharedsshkey_pgrs outputs: - version: + blueprint_version: value: { get_input: blueprint_version } |