diff options
35 files changed, 303 insertions, 392 deletions
diff --git a/blueprints/k8s-config_binding_service.yaml-template b/blueprints/k8s-config_binding_service.yaml-template deleted file mode 100644 index 1822025..0000000 --- a/blueprints/k8s-config_binding_service.yaml-template +++ /dev/null @@ -1,53 +0,0 @@ -# -*- indent-tabs-mode: nil -*- # vi: set expandtab: -# -# ============LICENSE_START==================================================== -# ============================================================================= -# Copyright (c) 2017-2018 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: > - This blueprint installs the config binding service - -imports: - - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml - -inputs: - - cbs_image: - description: Docker image for config binding service - default: {{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.3 - replicas: - description: Number of instances to launch - type: integer - default: 1 - -node_templates: - # Config binding service - service-config-binding: - type: dcae.nodes.ContainerizedPlatformComponent - properties: - name: 'config-binding-service' - container_port: 10000 - image: { get_input: cbs_image } - docker_config: - healthcheck: - type: "http" - endpoint: "/healthcheck" - replicas: {get_input: replicas} - log_info: - log_directory: "/opt/logs" diff --git a/blueprints/k8s-dashboard.yaml-template b/blueprints/k8s-dashboard.yaml-template new file mode 100644 index 0000000..80a6bcc --- /dev/null +++ b/blueprints/k8s-dashboard.yaml-template @@ -0,0 +1,114 @@ +# +# ============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.5/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.onap.svc.cluster.local' + 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 }] + cfy_url: http://dcae-cloudify-manager:8080 + #cfy_url: concat: ["http://", { get_input: cloudify_ip },":8080"] + 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' + 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-deployment_handler.yaml-template b/blueprints/k8s-deployment_handler.yaml-template deleted file mode 100644 index c28a4d4..0000000 --- a/blueprints/k8s-deployment_handler.yaml-template +++ /dev/null @@ -1,87 +0,0 @@ -# -*- indent-tabs-mode: nil -*- # vi: set expandtab: -# -# ============LICENSE_START========================================== -# org.onap.dcae -# =================================================================== -# Copyright © 2017-2018 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: > - This blueprint deploys/manages the DCAE deployment handler as a Docker container - -imports: - - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml - -inputs: - - deployment_handler_image: - description: Docker image for deployment handler - default: {{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.deployment-handler:3.2.0 - application_config: - description: deployment handler application configuration (to override defaults) - default: {} - host_port: - description: port on Kubernetes host where DH API will be exposed - default: 0 - host_log_root: - description: root directory for logs in the Docker host file system - default: '/opt/onap/log' - -node_templates: - - # Deployment Handler - deployment-handler: - type: dcae.nodes.ContainerizedPlatformComponent - properties: - name: - 'deployment_handler' - dns_name: - 'deployment-handler' - image: - { get_input: deployment_handler_image } - application_config: - { get_input: application_config } - host_port: - { get_input: host_port } - container_port: - 8443 - docker_config: - healthcheck: - type: 'https' - interval: '300s' - timeout: '5s' - endpoint: '/' - msb_registration: - port: '8443' - url_path: '/' - version: 'v4' - log_info: - log_directory: '/opt/app/dh/log' - tls_info: - cert_directory: '/opt/app/dh/etc/cert/' - use_tls: true - # Inject CM password through environment variable - # so that it does not appear in Consul - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - envs: - CLOUDIFY_PASSWORD: { get_secret: cmpass } - CLOUDIFY_USER: admin - diff --git a/blueprints/k8s-helm-override.yaml-template b/blueprints/k8s-helm-override.yaml-template new file mode 100644 index 0000000..31213d2 --- /dev/null +++ b/blueprints/k8s-helm-override.yaml-template @@ -0,0 +1,75 @@ +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2019 AT&T +# +# 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: + - http://www.getcloudify.org/spec/cloudify/4.3.1/types.yaml + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/helm/4.0.0/helm-type.yaml" + +inputs: + tiller-server-ip: + description: IP address of Kubernetes master node + tiller-server-port: + description: Nodeport of tiller server + namespace: + 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 + stable-repo-url: + description: URL for stable repository + type: string + default: 'https://kubernetes-charts.storage.googleapis.com' + config-url: + default: '' + config-format: + default: 'yaml' + component-name: + description: onap component name +node_templates: + onap_env: + type: onap.nodes.component + properties: + tiller-server-ip: { get_input: tiller-server-ip } + tiller-server-port: { get_input: tiller-server-port } + component-name: onap + chart-repo-url: { get_input: chart-repo-url } + chart-version: { get_input: chart-version } + namespace: { get_input: namespace } + stable-repo-url: { get_input: stable-repo-url} + config: '{ "aaf": {"enabled": false}, "aai": {"enabled": false}, "appc": {"enabled": false}, "clamp": {"enabled": false}, "cli": {"enabled": false}, "consul": {"enabled": false}, "dcaegen2": {"enabled": false}, "dmaap": {"enabled": false}, "esr": {"enabled": false}, "log": {"enabled": false}, "sniro-emulator": {"enabled": false}, "msb": {"enabled": false}, "multicloud": {"enabled": false}, "nbi": {"enabled": false}, "oof": {"enabled": false}, "policy": {"enabled": false}, "pomba": {"enabled": false}, "portal": {"enabled": false}, "robot": {"enabled": false}, "sdc": {"enabled": false}, "sdnc": {"enabled": false}, "so": {"enabled": false}, "uui": {"enabled": false}, "vfc": {"enabled": false}, "vid": {"enabled": false}, "vnfsdk": {"enabled": false} }' + + dcaecomponent: + type: onap.nodes.component + properties: + tiller-server-ip: { get_input: tiller-server-ip } + tiller-server-port: { get_input: tiller-server-port } + component-name: { get_input: component-name } + chart-repo-url: { get_input: chart-repo-url } + chart-version: { get_input: chart-version } + namespace: { get_input: namespace } + stable-repo-url: { get_input: stable-repo-url} + config-url: { get_input: config-url} + config-format: { get_input: config-format} + relationships: + - type: cloudify.relationships.connected_to + target: onap_env +outputs: + dcaecomponent_install_status: + value: { get_attribute: [ dcaecomponent, install-status ] } + diff --git a/blueprints/k8s-helm.yaml-template b/blueprints/k8s-helm.yaml-template new file mode 100644 index 0000000..d2562e0 --- /dev/null +++ b/blueprints/k8s-helm.yaml-template @@ -0,0 +1,60 @@ +# ============LICENSE_START========================================== +# =================================================================== +# Copyright (c) 2019 AT&T +# +# 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: + - http://www.getcloudify.org/spec/cloudify/4.3.1/types.yaml + - "{{ ONAPTEMPLATE_RAWREPOURL_org_onap_ccsdk_platform_plugins_releases }}/type_files/helm/4.0.0/helm-type.yaml" + +inputs: + tiller-server-ip: + description: IP address of Kubernetes master node + tiller-server-port: + description: Nodeport of tiller server + namespace: + 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 + stable-repo-url: + description: URL for stable repository + type: string + default: 'https://kubernetes-charts.storage.googleapis.com' + config-url: + default: '' + config-format: + default: 'yaml' + component-name: + description: onap component name +node_templates: + dcaecomponent: + type: onap.nodes.component + properties: + tiller-server-ip: { get_input: tiller-server-ip } + tiller-server-port: { get_input: tiller-server-port } + component-name: { get_input: component-name } + chart-repo-url: { get_input: chart-repo-url } + chart-version: { get_input: chart-version } + namespace: { get_input: namespace } + stable-repo-url: { get_input: stable-repo-url} + config-url: { get_input: config-url} + config-format: { get_input: config-format} +outputs: + dcaecomponent_install_status: + value: { get_attribute: [ dcaecomponent, install-status ] } + diff --git a/blueprints/k8s-inventory.yaml-template b/blueprints/k8s-inventory.yaml-template deleted file mode 100644 index 499cdd5..0000000 --- a/blueprints/k8s-inventory.yaml-template +++ /dev/null @@ -1,180 +0,0 @@ -# -*- indent-tabs-mode: nil -*- # vi: set expandtab: -# -# ============LICENSE_START==================================================== -# org.onap.dcae -# ============================================================================= -# Copyright (c) 2017-2018 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: > - This blueprint is used to install and to uninstall DCAE inventory and DCAE service change - handler which are platform services. These applications are Docker containers. This blueprint - depends upon the deployment of a Docker host and the deployment of a central postgres that is - registered with Consul. - -imports: - - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml - -inputs: - - sdc_address: - description: SDC host - sdc_uri: - description: SDC url - sdc_msg_bus_address: - description: Message router hostname that SDC will send distribution events through - sdc_user: - description: SDC username - sdc_password: - description: SDC password - sdc_environment_name: - description: SDC environment name - sdc_use_secure_https: - description: Boolean to toggle whether to do certificate validation for https calls to SDC API - type: boolean - default: false - sdc_use_https_dmaap: - description: Boolean to toggle whether to use https for calls to message router API - type: boolean - default: false - - postgres_user_inventory: - description: Postgres user for inventory - postgres_password_inventory: - description: Postgres password for inventory - - service_change_handler_image: - description: Full uri to service change handler Docker image - default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5" - inventory_image: - description: Full uri to inventory Docker image - default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.inventory-api:3.0.1" - -node_templates: - - service-change-handler: - type: dcae.nodes.ContainerizedPlatformComponent - properties: - name: - "service-change-handler" - application_config: - asdcDistributionClient: - asdcAddress: { get_input: sdc_address } - asdcUri: { get_input: sdc_uri } - msgBusAddress: { get_input: sdc_msg_bus_address } - user: { get_input: sdc_user } - password: { get_input: sdc_password } - pollingInterval: 20 - pollingTimeout: 20 - consumerGroup: dcae - consumerId: dcae-sch - environmentName: { get_input: sdc_environment_name } - keyStorePath: - keyStorePassword: - activateServerTLSAuth: { get_input: sdc_use_secure_https } - useHttpsWithDmaap: { get_input: sdc_use_https_dmaap } - isFilterInEmptyResources: false - dcaeInventoryClient: - uri: http://inventory:8080 - docker_config: - healthcheck: - type: "docker" - interval: "30s" - timeout: "3s" - script: "/opt/health.sh" - image: - { get_input: service_change_handler_image } - relationships: - - type: cloudify.relationships.depends_on - target: inventory - - inventory: - type: dcae.nodes.ContainerizedPlatformComponent - properties: - name: - "inventory" - application_config: - database: - driverClass: org.postgresql.Driver - user: { get_input: postgres_user_inventory } - password: { get_input: postgres_password_inventory } - # NOTE: The database name here has been changed to the default "postgres" database - # to use the private postgres instance and not the central postgres database. - url: jdbc:postgresql://pstg-write:5432/postgres - properties: - charSet: UTF-8 - maxWaitForConnection: 1s - validationQuery: "/* MyService Health Check */ SELECT 1" - minSize: 2 - maxSize: 8 - initialSize: 2 - checkConnectionWhileIdle: false - evictionInterval: 10s - minIdleTime: 1 minute - databusControllerConnection: - host: databus-controller-hostname - port: 8443 - mechId: - password: - required: false - httpClient: - minThreads: 1 - maxThreads: 128 - gzipEnabled: false - gzipEnabledForRequests: false - timeout: 5000milliseconds - connectionTimeout: 5000milliseconds - docker_config: - healthcheck: - type: "http" - interval: "30s" - timeout: "3s" - endpoint: "/dcae-service-types" - image: - { get_input: inventory_image } - container_port: - 8080 - relationships: - - type: cloudify.relationships.depends_on - target: postgres - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - max_wait: 1800 - - postgres: - type: dcae.nodes.ContainerizedApplication - properties: - name: - "pstg-write" - image: - "postgres:9.5.2" - interfaces: - cloudify.interfaces.lifecycle: - start: - inputs: - envs: - PGDATA: - "/var/lib/postgresql/data/pgdata" - POSTGRES_PASSWORD: - { get_input: postgres_password_inventory } - SERVICE_NAME: - "pstg-write" - ports: - - "5432:0" diff --git a/blueprints/k8s-policy_handler.yaml-template b/blueprints/k8s-policy_handler.yaml-template deleted file mode 100644 index 3b2e071..0000000 --- a/blueprints/k8s-policy_handler.yaml-template +++ /dev/null @@ -1,60 +0,0 @@ -# -*- 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: > - This blueprint deploys/manages the DCAE policy-handler as a Docker container - -imports: - - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml - - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases }}/k8splugin/1.4.5/k8splugin_types.yaml - - -inputs: - - policy_handler_image: - description: Docker image for policy_handler - default: '{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.platform.policy-handler:5.0.0' - - application_config: - description: policy handler application configuration - requires info on policy-engine - default: {} - -node_templates: - policy_handler: - type: dcae.nodes.ContainerizedPlatformComponent - properties: - name: 'policy_handler' - dns_name: 'policy-handler' - image: { get_input: policy_handler_image } - application_config: { get_input: application_config } - docker_config: - healthcheck: - type: 'http' - interval: '300s' - timeout: '25s' - endpoint: '/healthcheck' - log_info: - log_directory: '/opt/app/policy_handler/logs' - container_port: 25577 - tls_info: - cert_directory: '/opt/app/policy_handler/etc/tls/certs/' - use_tls: true diff --git a/blueprints/k8s-snmptrap.yaml-template b/blueprints/k8s-snmptrap.yaml-template index 177efd1..6111e32 100644 --- a/blueprints/k8s-snmptrap.yaml-template +++ b/blueprints/k8s-snmptrap.yaml-template @@ -2,7 +2,7 @@ # # ============LICENSE_START==================================================== # ============================================================================= -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-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. @@ -73,6 +73,10 @@ inputs: default: title: Collector for receiving SNMP traps and publishing to DMAAP/MR version: 1.4.0 + external_port: + type: string + description: Kubernetes node port on which collector is exposed + default: "30470" replicas: type: integer description: number of instances @@ -85,7 +89,7 @@ node_templates: start: inputs: ports: - - '6162:0' + - concat: ["6162/udp:", { get_input: external_port }] properties: application_config: StormWatchPolicy: '' @@ -108,15 +112,6 @@ node_templates: get_input: sec_fault_unsecure_topic type: message_router -# TBA under DCAEGEN2-796 -# docker_config: -# healthcheck: -# interval: 300s -# script: /opt/app/snmptrap/bin/snmptrapd.sh status -# timeout: 120s -# type: docker -# ports: -# - 6162/udp:162 image: get_input: tag_version replicas: {get_input: replicas} diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template index d29de01..29071f4 100644 --- a/blueprints/k8s-ves.yaml-template +++ b/blueprints/k8s-ves.yaml-template @@ -2,7 +2,7 @@ # # ============LICENSE_START==================================================== # ============================================================================= -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2018-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. @@ -49,6 +49,10 @@ inputs: type: string description: Kubernetes node port on which collector is exposed default: "30235" + external_tls_port: + type: string + description: Kubernetes node port on which collector is exposed for https + default: "30417" replicas: type: integer description: number of instances @@ -61,6 +65,7 @@ node_templates: inputs: ports: - concat: ["8080:", { get_input: external_port }] + - concat: ["8443:", { get_input: external_tls_port }] properties: application_config: collector.dmaap.streamid: fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration diff --git a/blueprints/DeploymentHandler-README.md b/blueprints/reference_templates/DeploymentHandler-README.md index 8b76890..8b76890 100644 --- a/blueprints/DeploymentHandler-README.md +++ b/blueprints/reference_templates/DeploymentHandler-README.md diff --git a/blueprints/DeploymentHandler.yaml-template b/blueprints/reference_templates/DeploymentHandler.yaml-template index 4856636..4856636 100644 --- a/blueprints/DeploymentHandler.yaml-template +++ b/blueprints/reference_templates/DeploymentHandler.yaml-template diff --git a/blueprints/DockerBP.yaml-template b/blueprints/reference_templates/DockerBP.yaml-template index e655063..e655063 100644 --- a/blueprints/DockerBP.yaml-template +++ b/blueprints/reference_templates/DockerBP.yaml-template diff --git a/blueprints/reference_templates/README.txt b/blueprints/reference_templates/README.txt new file mode 100644 index 0000000..f6f038f --- /dev/null +++ b/blueprints/reference_templates/README.txt @@ -0,0 +1,42 @@ +Blueprints used for deployment of VM's and cluster for DCAE deployment (Amsterdam release) +========================================================================================= +centos_vm.yaml-template +DockerBP.yaml-template +consul_cluster.yaml-template +cdap-sdk.yaml-template +cdapbp7.yaml-template +pgaas-database.yaml-template +pgaas-cluster.yaml-template +pgaas-onevm.yaml-template +pgaas-getdbinfo.yaml-template +pgaas-disk.yaml-template +pgaas.yaml-template + + +Blueprint used for spinning up Platform components in VM's (Amsterdam release) +============================================================================== +centos_vm.yaml-template +inventory.yaml-template +cdap_broker.yaml-template +policy_handler.yaml-template +DeploymentHandler.yaml-template +config_binding_service.yaml-template + +Blueprint used for spinning up Service components in VM's (Amsterdam release) +============================================================================== +holmes-rules.yaml-template +holmes-engine.yaml-template +heartbeat-service.yaml-template +ves.yaml-template +tca.yaml-template +snmptrap-collector.yaml-template +prh-service.yaml-template +tcadocker-service.yaml-template + + +Blueprints used for K8S deployment through K8SPlugin +==================================================== +k8s-policy_handler.yaml-template +k8s-inventory.yaml-template +k8s-deployment_handler.yaml-template +k8s-config_binding_service.yaml-template diff --git a/blueprints/cdap-sdk.yaml-template b/blueprints/reference_templates/cdap-sdk.yaml-template index cd1244f..cd1244f 100644 --- a/blueprints/cdap-sdk.yaml-template +++ b/blueprints/reference_templates/cdap-sdk.yaml-template diff --git a/blueprints/cdap_broker.yaml-template b/blueprints/reference_templates/cdap_broker.yaml-template index 3c29634..3c29634 100644 --- a/blueprints/cdap_broker.yaml-template +++ b/blueprints/reference_templates/cdap_broker.yaml-template diff --git a/blueprints/cdapbp7.yaml-template b/blueprints/reference_templates/cdapbp7.yaml-template index 7fddaa1..7fddaa1 100644 --- a/blueprints/cdapbp7.yaml-template +++ b/blueprints/reference_templates/cdapbp7.yaml-template diff --git a/blueprints/centos_vm.yaml-template b/blueprints/reference_templates/centos_vm.yaml-template index aa3bdb4..aa3bdb4 100644 --- a/blueprints/centos_vm.yaml-template +++ b/blueprints/reference_templates/centos_vm.yaml-template diff --git a/blueprints/config_binding_service.yaml-template b/blueprints/reference_templates/config_binding_service.yaml-template index 28dfb43..28dfb43 100644 --- a/blueprints/config_binding_service.yaml-template +++ b/blueprints/reference_templates/config_binding_service.yaml-template diff --git a/blueprints/consul_cluster.yaml-template b/blueprints/reference_templates/consul_cluster.yaml-template index a4ae89e..a4ae89e 100644 --- a/blueprints/consul_cluster.yaml-template +++ b/blueprints/reference_templates/consul_cluster.yaml-template diff --git a/blueprints/heartbeat-service.yaml-template b/blueprints/reference_templates/heartbeat-service.yaml-template index 2654c71..2654c71 100644 --- a/blueprints/heartbeat-service.yaml-template +++ b/blueprints/reference_templates/heartbeat-service.yaml-template diff --git a/blueprints/holmes-engine.yaml-template b/blueprints/reference_templates/holmes-engine.yaml-template index 4661299..4661299 100644 --- a/blueprints/holmes-engine.yaml-template +++ b/blueprints/reference_templates/holmes-engine.yaml-template diff --git a/blueprints/holmes-rules.yaml-template b/blueprints/reference_templates/holmes-rules.yaml-template index dc0ab7d..dc0ab7d 100644 --- a/blueprints/holmes-rules.yaml-template +++ b/blueprints/reference_templates/holmes-rules.yaml-template diff --git a/blueprints/inventory.yaml-template b/blueprints/reference_templates/inventory.yaml-template index c427f8c..c427f8c 100644 --- a/blueprints/inventory.yaml-template +++ b/blueprints/reference_templates/inventory.yaml-template diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/reference_templates/pgaas-cluster.yaml-template index d7b0cd0..d7b0cd0 100644 --- a/blueprints/pgaas-cluster.yaml-template +++ b/blueprints/reference_templates/pgaas-cluster.yaml-template diff --git a/blueprints/pgaas-database.yaml-template b/blueprints/reference_templates/pgaas-database.yaml-template index a89d638..a89d638 100644 --- a/blueprints/pgaas-database.yaml-template +++ b/blueprints/reference_templates/pgaas-database.yaml-template diff --git a/blueprints/pgaas-disk.yaml-template b/blueprints/reference_templates/pgaas-disk.yaml-template index 3f96bae..3f96bae 100644 --- a/blueprints/pgaas-disk.yaml-template +++ b/blueprints/reference_templates/pgaas-disk.yaml-template diff --git a/blueprints/pgaas-getdbinfo.yaml-template b/blueprints/reference_templates/pgaas-getdbinfo.yaml-template index 8672f04..8672f04 100644 --- a/blueprints/pgaas-getdbinfo.yaml-template +++ b/blueprints/reference_templates/pgaas-getdbinfo.yaml-template diff --git a/blueprints/pgaas-onevm.yaml-template b/blueprints/reference_templates/pgaas-onevm.yaml-template index be2d044..be2d044 100644 --- a/blueprints/pgaas-onevm.yaml-template +++ b/blueprints/reference_templates/pgaas-onevm.yaml-template diff --git a/blueprints/pgaas.yaml-template b/blueprints/reference_templates/pgaas.yaml-template index 4a7e16a..4a7e16a 100644 --- a/blueprints/pgaas.yaml-template +++ b/blueprints/reference_templates/pgaas.yaml-template diff --git a/blueprints/policy_handler.yaml-template b/blueprints/reference_templates/policy_handler.yaml-template index 29e66e6..29e66e6 100644 --- a/blueprints/policy_handler.yaml-template +++ b/blueprints/reference_templates/policy_handler.yaml-template diff --git a/blueprints/prh-service.yaml-template b/blueprints/reference_templates/prh-service.yaml-template index 797cac0..797cac0 100644 --- a/blueprints/prh-service.yaml-template +++ b/blueprints/reference_templates/prh-service.yaml-template diff --git a/blueprints/snmptrap-collector.yaml-template b/blueprints/reference_templates/snmptrap-collector.yaml-template index 694fde5..694fde5 100644 --- a/blueprints/snmptrap-collector.yaml-template +++ b/blueprints/reference_templates/snmptrap-collector.yaml-template diff --git a/blueprints/tca.yaml-template b/blueprints/reference_templates/tca.yaml-template index 9699456..9699456 100644 --- a/blueprints/tca.yaml-template +++ b/blueprints/reference_templates/tca.yaml-template diff --git a/blueprints/tcadocker-service.yaml-template b/blueprints/reference_templates/tcadocker-service.yaml-template index 92deaa4..92deaa4 100644 --- a/blueprints/tcadocker-service.yaml-template +++ b/blueprints/reference_templates/tcadocker-service.yaml-template diff --git a/blueprints/ves.yaml-template b/blueprints/reference_templates/ves.yaml-template index 0653e3d..0653e3d 100644 --- a/blueprints/ves.yaml-template +++ b/blueprints/reference_templates/ves.yaml-template |