From 383449627256d59dd6e2ac6a1cf54d3bd4ce73fa Mon Sep 17 00:00:00 2001 From: Niranjana Date: Fri, 16 Apr 2021 14:11:51 +0000 Subject: Update DES and DL-feeder blueprints to use postgres DB for non-root access Issue-ID: DCAEGEN2-2329 Signed-off-by: Niranjana Change-Id: I88cbecc1417d6f141537a36b4e1c455ac298a3b0 --- blueprints/k8s-datalake-feeder.yaml | 70 +++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 30 deletions(-) (limited to 'blueprints/k8s-datalake-feeder.yaml') diff --git a/blueprints/k8s-datalake-feeder.yaml b/blueprints/k8s-datalake-feeder.yaml index 3d890e6..088b4be 100644 --- a/blueprints/k8s-datalake-feeder.yaml +++ b/blueprints/k8s-datalake-feeder.yaml @@ -2,6 +2,7 @@ # ============================================================================= # Copyright (C) 2020 QCT. All rights reserved. # Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2021 Wipro Limited. 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. @@ -22,28 +23,16 @@ tosca_definitions_version: cloudify_dsl_1_3 imports: - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml - plugin:k8splugin?version=>=3.4.3,<4.0.0 - + - plugin:pgaas?version=1.3.0 inputs: - mariadb_address: - type: string - description: MariaDB URL - default: "mariadb-galera" - mariadb_port: - type: string - description: MariaDB port - default: "3306" - db_username: - type: string - description: MariaDB Username - default: "root" - db_password: - description: MariaDB password + pg_dbName: type: string - default: "vlz8CJL1" + description: DB name + default: "datalake" image_name: description: datalake feeder image URL. type: string - default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakefeeder:1.1.0 + default: nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.datalakefeeder:1.1.1 dl_hostname: type: string description: dl default dl_hostname @@ -73,8 +62,19 @@ inputs: service_component_name_override: type: string default: "dcae-dl-feeder" + pgaas_cluster_name: + type: string + description: pg cluster + default: "dcae-pg-primary.onap" node_templates: + feederpgaas: + type: dcae.nodes.pgaas.database + properties: + writerfqdn: { get_input: pgaas_cluster_name } + name: { get_input: pg_dbName} + use_existing: false + datalake: type: dcae.nodes.ContainerizedServiceComponent interfaces: @@ -85,20 +85,28 @@ node_templates: - '1680:0' - concat: [{get_input: container_port},":",{get_input: host_port}] envs: - MYSQL_HOST: - get_input: mariadb_address - MYSQL_PORT: - get_input: mariadb_port - MYSQL_ROOT_PASSWORD: - get_input: db_password + PG_HOST: + { get_attribute: [ feederpgaas, admin, host ] } + PG_PORT: + { get_attribute: [ feederpgaas, admin, port ] } + PG_USER: + { get_attribute: [ feederpgaas, admin, user ] } + PG_PASSWORD: + { get_attribute: [ feederpgaas, admin, password ] } + PG_DB: + get_input: pg_dbName properties: application_config: - MYSQL_HOST: - get_input: mariadb_address - MYSQL_PORT: - get_input: mariadb_port - MYSQL_ROOT_PASSWORD: - get_input: db_password + PG_HOST: + { get_attribute: [ feederpgaas, admin, host ] } + PG_PORT: + { get_attribute: [ feederpgaas, admin, port ] } + PG_USER: + { get_attribute: [ feederpgaas, admin, user ] } + PG_PASSWORD: + { get_attribute: [ feederpgaas, admin, password ] } + PG_DB: + get_input: pg_dbName HOSTNAME: get_input: dl_hostname CONSUL_HOST: @@ -116,4 +124,6 @@ node_templates: service_component_type: { get_input: service_component_type } service_id: { get_input: service_id } service_component_name_override: { get_input: service_component_name_override } - + relationships: + - type: cloudify.relationships.depends_on + target: feederpgaas -- cgit 1.2.3-korg