From 749bc2d89911bcb91dcf3a3d84edcf2cb5a151c2 Mon Sep 17 00:00:00 2001 From: Tony Hansen Date: Tue, 3 Oct 2017 02:51:42 +0000 Subject: fix up license text, descriptions make all license blocks more comparable Change-Id: I57b6270b05b69845a9abb4e1061cf36f14e2b434 Signed-off-by: Tony Hansen Issue-ID: DCAEGEN2-49 --- blueprints/DeploymentHandler.yaml-template | 2 ++ blueprints/DockerBP.yaml | 20 ++++++++++++++++++++ blueprints/cdap_broker.yaml | 20 ++++++++++++++++++++ blueprints/cdapbp7.yaml-template | 2 ++ blueprints/centos_vm.yaml-template | 2 ++ blueprints/config_binding_service.yaml | 20 ++++++++++++++++++++ blueprints/consul_cluster.yaml-template | 2 ++ blueprints/inventory.yaml | 20 ++++++++++++++++++++ blueprints/pgaas-cluster.yaml-template | 5 +---- blueprints/pgaas-database.yaml-template | 18 ++++++++++++++++++ blueprints/pgaas-disk.yaml-template | 18 ++++++++++++++++++ blueprints/pgaas-getdbinfo.yaml-template | 18 ++++++++++++++++++ blueprints/pgaas.yaml-template | 7 +++++-- blueprints/policy_handler.yaml-template | 2 ++ blueprints/policy_handler_sample_app_config.yaml | 2 ++ 15 files changed, 152 insertions(+), 6 deletions(-) diff --git a/blueprints/DeploymentHandler.yaml-template b/blueprints/DeploymentHandler.yaml-template index d18ad61..ba17495 100644 --- a/blueprints/DeploymentHandler.yaml-template +++ b/blueprints/DeploymentHandler.yaml-template @@ -1,5 +1,7 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: # # ============LICENSE_START========================================== +# org.onap.dcae # =================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # =================================================================== diff --git a/blueprints/DockerBP.yaml b/blueprints/DockerBP.yaml index 37685d8..c07fd05 100644 --- a/blueprints/DockerBP.yaml +++ b/blueprints/DockerBP.yaml @@ -1,3 +1,23 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== + tosca_definitions_version: cloudify_dsl_1_3 imports: diff --git a/blueprints/cdap_broker.yaml b/blueprints/cdap_broker.yaml index 8d68f62..2d51b9c 100644 --- a/blueprints/cdap_broker.yaml +++ b/blueprints/cdap_broker.yaml @@ -1,3 +1,23 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== + tosca_definitions_version: cloudify_dsl_1_3 description: > diff --git a/blueprints/cdapbp7.yaml-template b/blueprints/cdapbp7.yaml-template index cad5da2..4480d9a 100644 --- a/blueprints/cdapbp7.yaml-template +++ b/blueprints/cdapbp7.yaml-template @@ -1,3 +1,5 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# # ============LICENSE_START==================================================== # org.onap.dcae # ============================================================================= diff --git a/blueprints/centos_vm.yaml-template b/blueprints/centos_vm.yaml-template index 5dc29dd..1211625 100644 --- a/blueprints/centos_vm.yaml-template +++ b/blueprints/centos_vm.yaml-template @@ -1,5 +1,7 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: # # ============LICENSE_START========================================== +# org.onap.dcae # =================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # =================================================================== diff --git a/blueprints/config_binding_service.yaml b/blueprints/config_binding_service.yaml index fb2198f..68cb553 100644 --- a/blueprints/config_binding_service.yaml +++ b/blueprints/config_binding_service.yaml @@ -1,3 +1,23 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== + tosca_definitions_version: cloudify_dsl_1_3 description: > diff --git a/blueprints/consul_cluster.yaml-template b/blueprints/consul_cluster.yaml-template index 0fb205e..6bf9eaf 100644 --- a/blueprints/consul_cluster.yaml-template +++ b/blueprints/consul_cluster.yaml-template @@ -1,5 +1,7 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: # # ============LICENSE_START========================================== +# org.onap.dcae # =================================================================== # Copyright © 2017 AT&T Intellectual Property. All rights reserved. # =================================================================== diff --git a/blueprints/inventory.yaml b/blueprints/inventory.yaml index 1daea75..798f721 100644 --- a/blueprints/inventory.yaml +++ b/blueprints/inventory.yaml @@ -1,3 +1,23 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== + tosca_definitions_version: cloudify_dsl_1_3 description: > diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template index 7411c06..e7b227d 100644 --- a/blueprints/pgaas-cluster.yaml-template +++ b/blueprints/pgaas-cluster.yaml-template @@ -1,8 +1,5 @@ # -*- indent-tabs-mode: nil -*- # vi: set expandtab: - -# TODO -# add consul registration - +# # ============LICENSE_START==================================================== # org.onap.dcae # ============================================================================= diff --git a/blueprints/pgaas-database.yaml-template b/blueprints/pgaas-database.yaml-template index 45acd56..6d1088e 100644 --- a/blueprints/pgaas-database.yaml-template +++ b/blueprints/pgaas-database.yaml-template @@ -1,4 +1,22 @@ # -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== tosca_definitions_version: cloudify_dsl_1_3 diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/pgaas-disk.yaml-template index e451886..3629ef4 100644 --- a/blueprints/pgaas-disk.yaml-template +++ b/blueprints/pgaas-disk.yaml-template @@ -1,4 +1,22 @@ # -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== tosca_definitions_version: cloudify_dsl_1_3 diff --git a/blueprints/pgaas-getdbinfo.yaml-template b/blueprints/pgaas-getdbinfo.yaml-template index 833d72a..95fd654 100644 --- a/blueprints/pgaas-getdbinfo.yaml-template +++ b/blueprints/pgaas-getdbinfo.yaml-template @@ -1,4 +1,22 @@ # -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# ============================================================================= +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END====================================================== tosca_definitions_version: cloudify_dsl_1_3 diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template index 74584cf..a9aa85b 100644 --- a/blueprints/pgaas.yaml-template +++ b/blueprints/pgaas.yaml-template @@ -1,6 +1,5 @@ # -*- indent-tabs-mode: nil -*- # vi: set expandtab: - - +# # ============LICENSE_START==================================================== # org.onap.dcae # ============================================================================= @@ -21,6 +20,10 @@ 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 diff --git a/blueprints/policy_handler.yaml-template b/blueprints/policy_handler.yaml-template index b2e2324..9296514 100644 --- a/blueprints/policy_handler.yaml-template +++ b/blueprints/policy_handler.yaml-template @@ -1,3 +1,5 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ diff --git a/blueprints/policy_handler_sample_app_config.yaml b/blueprints/policy_handler_sample_app_config.yaml index 4feeb37..acfc645 100644 --- a/blueprints/policy_handler_sample_app_config.yaml +++ b/blueprints/policy_handler_sample_app_config.yaml @@ -1,3 +1,5 @@ +# -*- indent-tabs-mode: nil -*- # vi: set expandtab: +# # ============LICENSE_START======================================================= # org.onap.dcae # ================================================================================ -- cgit 1.2.3-korg