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-cluster.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-cluster.yaml-template')
| -rw-r--r-- | blueprints/pgaas-cluster.yaml-template | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template index 59b188a..a1885f1 100644 --- a/blueprints/pgaas-cluster.yaml-template +++ b/blueprints/pgaas-cluster.yaml-template @@ -42,35 +42,17 @@ 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: type: string default: pgcl +{{ ONAPTEMPLATE_STANDARD_INPUTS_TYPES }} + vm_init_pgrs: type: string default: | @@ -183,7 +165,7 @@ node_templates: args: floating_network_name: { get_input: public_net } dns_pgrs00: - type: dcae.nodes.dns.arecord + type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '00.', { get_input: location_domain } ] } openstack: *open_conf @@ -285,7 +267,7 @@ node_templates: args: floating_network_name: { get_input: public_net } dns_pgrs01: - type: dcae.nodes.dns.arecord + type: ccsdk.nodes.dns.arecord properties: fqdn: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '01.', { get_input: location_domain } ] } openstack: *open_conf @@ -389,7 +371,7 @@ node_templates: # CNAME records dns_pgrs_rw: - type: dcae.nodes.dns.cnamerecord + type: ccsdk.nodes.dns.cnamerecord properties: fqdn: { concat: [ { get_input: location_prefix }, '-', { get_input: pgaas_cluster_name }, '-write.', { get_input: location_domain } ] } openstack: *open_conf @@ -401,7 +383,7 @@ node_templates: cname: { concat: [ { get_input: location_prefix }, { get_input: pgaas_cluster_name }, '00.', { get_input: location_domain } ] } dns_pgrs_ro: - type: dcae.nodes.dns.cnamerecord + type: ccsdk.nodes.dns.cnamerecord properties: fqdn: { concat: [ { get_input: location_prefix }, '-', { get_input: pgaas_cluster_name }, '.', { get_input: location_domain } ] } openstack: *open_conf @@ -437,5 +419,5 @@ outputs: value: { get_property: [ dns_pgrs00, fqdn ] } dns_pgrs01: value: { get_property: [ dns_pgrs01, fqdn ] } - version: + blueprint_version: value: { get_input: blueprint_version } |