From b3eebb82c2758a63e8c8764ffe523a566d10a0ca Mon Sep 17 00:00:00 2001 From: Jack Lucas Date: Fri, 10 Jan 2020 13:24:50 -0500 Subject: Fix import file versions Issue-ID: DCAEGEN2-2018 Signed-off-by: Jack Lucas Change-Id: Ia9dd43974bf8a3e1c34cda1bb130798ea9ace353 --- blueprints/k8s-dashboard.yaml-template | 119 --------------------- blueprints/k8s-helm-override.yaml-template | 2 +- blueprints/k8s-helm.yaml-template | 6 +- blueprints/k8s-holmes-engine.yaml-template | 5 +- blueprints/k8s-holmes-rules.yaml-template | 5 +- blueprints/k8s-hv-ves.yaml-template | 4 +- blueprints/k8s-pgaas-initdb.yaml-template | 8 +- blueprints/k8s-prh.yaml-template | 4 +- blueprints/k8s-snmptrap.yaml-template | 4 +- blueprints/k8s-tca-clampnode.yaml-template | 6 +- blueprints/k8s-tca-policynode.yaml-template | 4 +- blueprints/k8s-tca.yaml-template | 2 +- blueprints/k8s-ves.yaml-template | 4 +- .../k8s-dashboard.yaml-template | 119 +++++++++++++++++++++ 14 files changed, 147 insertions(+), 145 deletions(-) delete mode 100644 blueprints/k8s-dashboard.yaml-template create mode 100644 blueprints/reference_templates/k8s-dashboard.yaml-template diff --git a/blueprints/k8s-dashboard.yaml-template b/blueprints/k8s-dashboard.yaml-template deleted file mode 100644 index 1d0fa10..0000000 --- a/blueprints/k8s-dashboard.yaml-template +++ /dev/null @@ -1,119 +0,0 @@ -# ============LICENSE_START==================================================== -# org.onap.dcae -# ============================================================================= -# Copyright (c) 2019 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: -- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml" -- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml" - -inputs: - database_cluster_name: - type: string - default: 'dcae-pg-primary.onap' - database_cluster_fqdn: - type: string - default: 'dcae-pg-primary.onap.svc.cluster.local' - database_name: - type: string - default: 'dashboard_pg' - postgres_port: - description: 'Postgres port for dashboard' - default: '5432' - dashboard_docker_image: - description: 'Docker image for dashboard' - default: 'nexus3.onap.org:10001/onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0-SNAPSHOT-latest' - cloudify_ip: - type: string - default: 'dcae-cloudify-manager' - cloudify_user: - type: string - default: 'admin' - cloudify_password: - type: string - default: 'admin' - consul_url: - type: string - default: 'consul-server-ui' - external_port: - type: string - description: Kubernetes node port for standard http - default: "30418" - external_tls_port: - type: string - description: Kubernetes node port for standard https - default: "30419" - replicas: - type: integer - description: number of instances - default: 1 -node_templates: - pgaasdb: - type: dcae.nodes.pgaas.database - properties: - writerfqdn: { get_input: database_cluster_name } - name: { get_input: database_name } - dashboard_deployment: - type: dcae.nodes.ContainerizedPlatformComponent - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - envs: - postgres_ip: - { get_input: database_cluster_fqdn } - postgres_db_name: - { get_input: database_name } - postgres_password_dashboard: - { get_attribute: [ pgaasdb, admin, password ] } - postgres_user_dashboard: - { get_attribute: [ pgaasdb, admin, user ] } - postgres_port: { get_input: postgres_port } - cloudify_user: { get_input: cloudify_user } - cloudify_password: { get_input: cloudify_password } - #consul_url: http://consul-server.onap.svc.cluster.local - consul_url: - concat: ["http://", { get_input: consul_url },":8500"] - #cfy_url: http://dcae-cloudify-manager:8080 - cfy_url: - concat: ["http://", { get_input: cloudify_ip },"/api/v3.1"] - inventory_url: http://inventory:8080 - dhandler_url: https://deployment-handler:8443 - ports: - - concat: ["8080:", { get_input: external_port }] - - concat: ["8443:", { get_input: external_tls_port }] - properties: - name: - "dcae-dashboard" - image: - { get_input: dashboard_docker_image } - replicas: {get_input: replicas} - dns_name: 'dcae-dashboard' - tls_info: - cert_directory: '/usr/local/share/ca-certificates/' - use_tls: true - docker_config: - healthcheck: - endpoint: /ccsdk-app/health - interval: 15s - timeout: 1s - type: http - relationships: - - type: cloudify.relationships.depends_on - target: pgaasdb - diff --git a/blueprints/k8s-helm-override.yaml-template b/blueprints/k8s-helm-override.yaml-template index 31213d2..dc53dde 100644 --- a/blueprints/k8s-helm-override.yaml-template +++ b/blueprints/k8s-helm-override.yaml-template @@ -17,7 +17,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - - http://www.getcloudify.org/spec/cloudify/4.3.1/types.yaml + - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/helm/4.0.0/helm-type.yaml" inputs: diff --git a/blueprints/k8s-helm.yaml-template b/blueprints/k8s-helm.yaml-template index d2562e0..958f0e6 100644 --- a/blueprints/k8s-helm.yaml-template +++ b/blueprints/k8s-helm.yaml-template @@ -17,7 +17,7 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - - http://www.getcloudify.org/spec/cloudify/4.3.1/types.yaml + - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/helm/4.0.0/helm-type.yaml" inputs: @@ -26,11 +26,11 @@ inputs: tiller-server-port: description: Nodeport of tiller server namespace: - description: Target namespace to be installed under (requires to be new) + description: Target namespace to be installed under (requires to be new) chart-repo-url: default: https://nexus.onap.org/content/sites/oom-helm-staging chart-version : - description: Chart version for identified component-name + description: Chart version for identified component-name stable-repo-url: description: URL for stable repository type: string diff --git a/blueprints/k8s-holmes-engine.yaml-template b/blueprints/k8s-holmes-engine.yaml-template index db947e0..4fd371d 100644 --- a/blueprints/k8s-holmes-engine.yaml-template +++ b/blueprints/k8s-holmes-engine.yaml-template @@ -19,8 +19,9 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: -- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml" -- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml" +- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml +- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml" +- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml" - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml" inputs: dcae_CL_publish_url: diff --git a/blueprints/k8s-holmes-rules.yaml-template b/blueprints/k8s-holmes-rules.yaml-template index e858587..867f6c4 100644 --- a/blueprints/k8s-holmes-rules.yaml-template +++ b/blueprints/k8s-holmes-rules.yaml-template @@ -19,8 +19,9 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: -- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml" -- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml" +- https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml +- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml" +- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml" - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml" inputs: msb_hostname: diff --git a/blueprints/k8s-hv-ves.yaml-template b/blueprints/k8s-hv-ves.yaml-template index 885a42e..9452a5c 100644 --- a/blueprints/k8s-hv-ves.yaml-template +++ b/blueprints/k8s-hv-ves.yaml-template @@ -20,8 +20,8 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - - 'http://www.getcloudify.org/spec/cloudify/3.4/types.yaml' - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.6.0/k8splugin_types.yaml + - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml inputs: tag_version: diff --git a/blueprints/k8s-pgaas-initdb.yaml-template b/blueprints/k8s-pgaas-initdb.yaml-template index 7dd7037..2022300 100644 --- a/blueprints/k8s-pgaas-initdb.yaml-template +++ b/blueprints/k8s-pgaas-initdb.yaml-template @@ -8,9 +8,9 @@ # 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. @@ -29,8 +29,8 @@ description: |- k8s-pgaas-getdbinfo shows how an application can access a database (including its roles and credentials) that was already created with k8s-pgaas-database. imports: - - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/relationshipplugin/1.0.0/relationshipplugin_types.yaml" + - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/relationshipplugin/1.1.0/relationshipplugin_types.yaml" - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/sshkeyshare/sshkey_types.yaml" - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml" diff --git a/blueprints/k8s-prh.yaml-template b/blueprints/k8s-prh.yaml-template index 347768f..96eef2f 100644 --- a/blueprints/k8s-prh.yaml-template +++ b/blueprints/k8s-prh.yaml-template @@ -20,8 +20,8 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.6.0/k8splugin_types.yaml + - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml inputs: pnfUrl: diff --git a/blueprints/k8s-snmptrap.yaml-template b/blueprints/k8s-snmptrap.yaml-template index d68bdd3..bc4fded 100644 --- a/blueprints/k8s-snmptrap.yaml-template +++ b/blueprints/k8s-snmptrap.yaml-template @@ -20,8 +20,8 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml + - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml inputs: tag_version: type: string diff --git a/blueprints/k8s-tca-clampnode.yaml-template b/blueprints/k8s-tca-clampnode.yaml-template index ce4885b..6b4d03d 100644 --- a/blueprints/k8s-tca-clampnode.yaml-template +++ b/blueprints/k8s-tca-clampnode.yaml-template @@ -23,8 +23,8 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml" - - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/clamppolicyplugin/1.0.0/clamppolicyplugin_types.yaml" + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml" + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml" inputs: aaiEnrichmentHost: type: string @@ -171,5 +171,5 @@ node_templates: properties: policy_id: get_input: policy_id - policy_model_id: + policy_model_id: get_input: policy_model_id diff --git a/blueprints/k8s-tca-policynode.yaml-template b/blueprints/k8s-tca-policynode.yaml-template index 604ee99..52155f0 100644 --- a/blueprints/k8s-tca-policynode.yaml-template +++ b/blueprints/k8s-tca-policynode.yaml-template @@ -23,8 +23,8 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml inputs: aaiEnrichmentHost: type: string diff --git a/blueprints/k8s-tca.yaml-template b/blueprints/k8s-tca.yaml-template index 05ab72f..2825bb4 100644 --- a/blueprints/k8s-tca.yaml-template +++ b/blueprints/k8s-tca.yaml-template @@ -23,7 +23,7 @@ description: > imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml inputs: aaiEnrichmentHost: type: string diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template index 51c5690..026f933 100644 --- a/blueprints/k8s-ves.yaml-template +++ b/blueprints/k8s-ves.yaml-template @@ -20,8 +20,8 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml" - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml + - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml + - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.7.1/k8splugin_types.yaml inputs: ves_other_publish_url: diff --git a/blueprints/reference_templates/k8s-dashboard.yaml-template b/blueprints/reference_templates/k8s-dashboard.yaml-template new file mode 100644 index 0000000..1d0fa10 --- /dev/null +++ b/blueprints/reference_templates/k8s-dashboard.yaml-template @@ -0,0 +1,119 @@ +# ============LICENSE_START==================================================== +# org.onap.dcae +# ============================================================================= +# Copyright (c) 2019 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: +- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.13/k8splugin_types.yaml" +- "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/pgaas/1.1.0/pgaas_types.yaml" + +inputs: + database_cluster_name: + type: string + default: 'dcae-pg-primary.onap' + database_cluster_fqdn: + type: string + default: 'dcae-pg-primary.onap.svc.cluster.local' + database_name: + type: string + default: 'dashboard_pg' + postgres_port: + description: 'Postgres port for dashboard' + default: '5432' + dashboard_docker_image: + description: 'Docker image for dashboard' + default: 'nexus3.onap.org:10001/onap/org.onap.ccsdk.dashboard.ccsdk-app-os:1.1.0-SNAPSHOT-latest' + cloudify_ip: + type: string + default: 'dcae-cloudify-manager' + cloudify_user: + type: string + default: 'admin' + cloudify_password: + type: string + default: 'admin' + consul_url: + type: string + default: 'consul-server-ui' + external_port: + type: string + description: Kubernetes node port for standard http + default: "30418" + external_tls_port: + type: string + description: Kubernetes node port for standard https + default: "30419" + replicas: + type: integer + description: number of instances + default: 1 +node_templates: + pgaasdb: + type: dcae.nodes.pgaas.database + properties: + writerfqdn: { get_input: database_cluster_name } + name: { get_input: database_name } + dashboard_deployment: + type: dcae.nodes.ContainerizedPlatformComponent + interfaces: + cloudify.interfaces.lifecycle: + start: + inputs: + envs: + postgres_ip: + { get_input: database_cluster_fqdn } + postgres_db_name: + { get_input: database_name } + postgres_password_dashboard: + { get_attribute: [ pgaasdb, admin, password ] } + postgres_user_dashboard: + { get_attribute: [ pgaasdb, admin, user ] } + postgres_port: { get_input: postgres_port } + cloudify_user: { get_input: cloudify_user } + cloudify_password: { get_input: cloudify_password } + #consul_url: http://consul-server.onap.svc.cluster.local + consul_url: + concat: ["http://", { get_input: consul_url },":8500"] + #cfy_url: http://dcae-cloudify-manager:8080 + cfy_url: + concat: ["http://", { get_input: cloudify_ip },"/api/v3.1"] + inventory_url: http://inventory:8080 + dhandler_url: https://deployment-handler:8443 + ports: + - concat: ["8080:", { get_input: external_port }] + - concat: ["8443:", { get_input: external_tls_port }] + properties: + name: + "dcae-dashboard" + image: + { get_input: dashboard_docker_image } + replicas: {get_input: replicas} + dns_name: 'dcae-dashboard' + tls_info: + cert_directory: '/usr/local/share/ca-certificates/' + use_tls: true + docker_config: + healthcheck: + endpoint: /ccsdk-app/health + interval: 15s + timeout: 1s + type: http + relationships: + - type: cloudify.relationships.depends_on + target: pgaasdb + -- cgit 1.2.3-korg