update pgaas blueprints

mv check-blueprint-vs-input here from utils
fix minor changes pointed out by check-blueprint-vs-input

Change-Id: Ie9383858177b7df2b068c4171280322c4f5a214f
Signed-off-by: Tony Hansen <tony@att.com>
Issue-Id: DCAEGEN2-49
Signed-off-by: Vijay <vv770d@att.com>

5 files changed, 25 insertions, 24 deletions

diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template
index 520def7..7411c06 100644
--- a/blueprints/pgaas-cluster.yaml-template
+++ b/blueprints/pgaas-cluster.yaml-template
@@ -23,7 +23,7 @@
 
 tosca_definitions_version: cloudify_dsl_1_3
 
-description: >
+description: |-
   This blueprint is used to install and to uninstall a central postgres as a platform service.
   This blueprint depends upon the deployment of the pgaas_plugin, the PGaaS Cinder volume, and Consul.
   This blueprint is part of a suite of three blueprints that allow a PGaaS
@@ -40,9 +40,9 @@ imports:
   - http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml
   - http://www.getcloudify.org/spec/fabric-plugin/1.4.1/plugin.yaml
 
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml"
 
 inputs:
   # environment info
diff --git a/blueprints/pgaas-database.yaml-template b/blueprints/pgaas-database.yaml-template
index c387d18..45acd56 100644
--- a/blueprints/pgaas-database.yaml-template
+++ b/blueprints/pgaas-database.yaml-template
@@ -2,7 +2,7 @@
 
 tosca_definitions_version: cloudify_dsl_1_3
 
-description: >
+description: |-
   This blueprint is used to install and to uninstall a persistent database into the central postgres as a platform service.
   This blueprint depends upon the deployment of the pgaas_plugin, the PGaaS Cinder volume, the PGaaS service, and Consul.
   This blueprint is part of a suite of three blueprints that allow a PGaaS
@@ -17,7 +17,7 @@ description: >
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
 
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml"
 
 inputs:
   # environment info
@@ -48,7 +48,8 @@ inputs:
   pgaas_cluster_name:
     type: string
     default: pgcl
-  database_contacts: {}
+  database_contacts:
+    type: {}
     default: {}
   database_description:
     type: string
diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/pgaas-disk.yaml-template
index e4c53b3..e451886 100644
--- a/blueprints/pgaas-disk.yaml-template
+++ b/blueprints/pgaas-disk.yaml-template
@@ -2,7 +2,7 @@
 
 tosca_definitions_version: cloudify_dsl_1_3
 
-description: >
+description: |-
   This blueprint is used to install and to uninstall the cinder volumes for
   a central postgres as a platform service.
   This blueprint depends upon the deployment of Consul and the pgaas_plugin.
@@ -20,10 +20,10 @@ imports:
   - http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml
   - http://www.getcloudify.org/spec/fabric-plugin/1.4.1/plugin.yaml
 
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/sshkeyshare/sshkey_types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/sshkeyshare/sshkey_types.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml"
 
 inputs:
   # environment info
@@ -54,6 +54,12 @@ inputs:
   pgaas_cluster_name:
     type: string
     default: pgcl
+<<<<<<< HEAD
+=======
+  cinder_volume_size:
+    type: string
+    default: 300
+>>>>>>> f62e307...  update pgaas blueprints
 
 node_templates:
   key_pair:
diff --git a/blueprints/pgaas-getdbinfo.yaml-template b/blueprints/pgaas-getdbinfo.yaml-template
index 9dfc89e..833d72a 100644
--- a/blueprints/pgaas-getdbinfo.yaml-template
+++ b/blueprints/pgaas-getdbinfo.yaml-template
@@ -2,7 +2,7 @@
 
 tosca_definitions_version: cloudify_dsl_1_3
  
-description: >
+description: |-
   This blueprint is an example of how an application can access the needed information about
   a persistent database created as part of a PGaaS cluster.
   
@@ -17,7 +17,7 @@ description: >
 imports: 
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
 
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml"
 
 inputs: 
   location_domain: 
diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template
index 810912e..74584cf 100644
--- a/blueprints/pgaas.yaml-template
+++ b/blueprints/pgaas.yaml-template
@@ -1,7 +1,5 @@
 # -*- indent-tabs-mode: nil -*- # vi: set expandtab:
 
-# TODO
-# add consul registration
 
 # ============LICENSE_START====================================================
 # org.onap.dcae
@@ -23,19 +21,15 @@
 
 tosca_definitions_version: cloudify_dsl_1_3
 
-description: >
-  This blueprint is used to install and to uninstall a central postgres as a platform service.
-  This blueprint depends upon the deployment of the pgaas_plugin and Consul.
-
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
   - http://www.getcloudify.org/spec/openstack-plugin/1.4/plugin.yaml
   - http://www.getcloudify.org/spec/fabric-plugin/1.4.1/plugin.yaml
 
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/sshkeyshare/sshkey_types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/dnsdesig/dns_types.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/sshkeyshare/sshkey_types.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/relationship/1.0.0/node-type.yaml"
+  - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/type_files/pgaas_plugin/1.0.0/pgaas_types.yaml"
 
 inputs:
   # environment info