diff options
Diffstat (limited to 'blueprints')
-rw-r--r-- | blueprints/pgaas-cluster.yaml-template | 32 | ||||
-rw-r--r-- | blueprints/pgaas-database.yaml-template | 24 | ||||
-rw-r--r-- | blueprints/pgaas-disk.yaml-template | 26 | ||||
-rw-r--r-- | blueprints/pgaas.yaml-template | 34 |
4 files changed, 22 insertions, 94 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 } diff --git a/blueprints/pgaas-database.yaml-template b/blueprints/pgaas-database.yaml-template index 6ee5297..e1b7450 100644 --- a/blueprints/pgaas-database.yaml-template +++ b/blueprints/pgaas-database.yaml-template @@ -38,29 +38,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: @@ -75,7 +55,9 @@ inputs: database_name: type: string default: sample - + +{{ ONAPTEMPLATE_STANDARD_INPUTS_TYPES }} + node_templates: pgaasdbtest: type: dcae.nodes.pgaas.database 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 } diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template index 16e3496..5dbf932 100644 --- a/blueprints/pgaas.yaml-template +++ b/blueprints/pgaas.yaml-template @@ -35,35 +35,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: pstg +{{ ONAPTEMPLATE_STANDARD_INPUTS_TYPES }} + vm_init_pgrs: type: string default: | @@ -155,7 +137,7 @@ node_templates: openstack_config: *open_conf sharedsshkey_pgrs: - type: dcae.nodes.ssh.keypair + type: ccsdk.nodes.ssh.keypair fixedip_pgrs00: type: cloudify.openstack.nodes.Port @@ -179,7 +161,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 @@ -281,7 +263,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 @@ -364,7 +346,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 @@ -376,7 +358,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 @@ -414,5 +396,5 @@ outputs: value: { get_property: [ dns_pgrs00, fqdn ] } dns_pgrs01: value: { get_property: [ dns_pgrs01, fqdn ] } - version: + blueprint_version: value: { get_input: blueprint_version } |