From 9bc6fd0629a825116fdfc7a94f54f5c1a5649d14 Mon Sep 17 00:00:00 2001 From: Lusheng Ji Date: Sun, 29 Apr 2018 19:45:23 -0400 Subject: Update k8s service component blueprints Issue-ID: DCAEGEN2-479 Change-Id: I885e251ef7af91669efef3995e3e813adc709b18 Signed-off-by: Lusheng Ji --- blueprints/k8s-holmes-engine.yaml-template | 18 ++++++++++++------ blueprints/k8s-holmes-rules.yaml-template | 10 ++++++---- blueprints/k8s-tca.yaml-template | 16 +++++++++------- blueprints/k8s-ves.yaml-template | 12 ++++++++---- 4 files changed, 35 insertions(+), 21 deletions(-) diff --git a/blueprints/k8s-holmes-engine.yaml-template b/blueprints/k8s-holmes-engine.yaml-template index dc933a3..8638add 100644 --- a/blueprints/k8s-holmes-engine.yaml-template +++ b/blueprints/k8s-holmes-engine.yaml-template @@ -25,17 +25,20 @@ imports: inputs: dcae_CL_publish_url: type: string - default: "http://10.0.11.1:3904/events/unauthenticated.DCAE_CL_OUTPUT" + default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_CL_OUTPUT" + #default: "http://10.0.11.1:3904/events/unauthenticated.DCAE_CL_OUTPUT" ves_fault_publish_url: type: string - default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT" + default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_FAULT_OUTPUT" + #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT" msb_hostname: type: string - default: "" + default: "msb-discovery.onap.svc.cluster.local" pgaas_cluster_name: type: string + default: "dcae-postgres.onap.svc.cluster.local" # use the single-VM PG instance - default: pgvm + #default: pgvm database_name: type: string default: holmes @@ -47,7 +50,8 @@ node_templates: pgaasvm: type: dcae.nodes.pgaas.database properties: - writerfqdn: { concat: [ { get_input: pgaas_cluster_name }, '-write.' ] } + #writerfqdn: { concat: [ { get_input: pgaas_cluster_name }, '-write.' ] } + writerfqdn: { get_input: pgaas_cluster_name } name: { get_input: database_name } use_existing: true @@ -93,7 +97,9 @@ node_templates: ports: - 9102:0 image: { get_input: he_image } - service_component_type: dcae-analytics-holmes-engine-management + # need to use truncated name!! + #service_component_type: dcae-analytics-holmes-engine-management + service_component_type: dcae-analytics-holmes-engin-management relationships: - type: cloudify.relationships.depends_on target: pgaasvm diff --git a/blueprints/k8s-holmes-rules.yaml-template b/blueprints/k8s-holmes-rules.yaml-template index 5c44c60..3fdb824 100644 --- a/blueprints/k8s-holmes-rules.yaml-template +++ b/blueprints/k8s-holmes-rules.yaml-template @@ -25,22 +25,24 @@ imports: inputs: msb_hostname: type: string - default: "" + default: "msb-discovery.onap.svc.cluster.local" pgaas_cluster_name: type: string + default: "dcae-postgres.onap.svc.cluster.local" # use the single-VM PG instance - default: pgvm + #default: pgvm database_name: type: string default: holmes hr_image: type: string - default: ""{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/holmes/rule-management:v1.0.0" + default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/holmes/rule-management:v1.0.0" node_templates: pgaasvm: type: dcae.nodes.pgaas.database properties: - writerfqdn: { concat: [ { get_input: pgaas_cluster_name }, '-write.' ] } + #writerfqdn: { concat: [ { get_input: pgaas_cluster_name }, '-write.' ] } + writerfqdn: { get_input: pgaas_cluster_name } name: { get_input: database_name } holmesrules: type: dcae.nodes.ContainerizedServiceComponentUsingDmaap diff --git a/blueprints/k8s-tca.yaml-template b/blueprints/k8s-tca.yaml-template index 5095344..6e1ef15 100644 --- a/blueprints/k8s-tca.yaml-template +++ b/blueprints/k8s-tca.yaml-template @@ -28,35 +28,37 @@ imports: inputs: aaiEnrichmentHost: type: string - default: "none" + default: "aai.onap.svc.cluster.local" aaiEnrichmentPort: type: string - default: 8443 + default: "8443" enableAAIEnrichment: type: string - default: false + default: true dmaap_host: type: string - default: dmaap.onap-message-router + default: message-router.onap.svc.cluster.local dmaap_port: type: string - default: 3904 + default: "3904" enableRedisCaching: type: string + default: false redisHosts: type: string + default: dcae-redis.onap.svc.cluster.local:6379 tag_version: type: string default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.0.0" consul_host: type: string - default: consul-server.onap-consul + default: consul-server.onap.svc.cluster.local consul_port: type: string default: "8500" cbs_host: type: string - default: "config-binding-service.dcae" + default: "config-binding-service.dcae.svc.cluster.local" cbs_port: type: string default: "10000" diff --git a/blueprints/k8s-ves.yaml-template b/blueprints/k8s-ves.yaml-template index 3b8b4bc..7c2f824 100644 --- a/blueprints/k8s-ves.yaml-template +++ b/blueprints/k8s-ves.yaml-template @@ -26,16 +26,20 @@ imports: inputs: ves_other_publish_url: type: string - default: "http://10.0.11.1:3904/events/unauthenticated.SEC_OTHER_OUTPUT" + default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_OTHER_OUTPUT" + #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_OTHER_OUTPUT" ves_heartbeat_publish_url: type: string - default: "http://10.0.11.1:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT" + default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT" + #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_HEARTBEAT_OUTPUT" ves_fault_publish_url: type: string - default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT" + default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_FAULT_OUTPUT" + #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_FAULT_OUTPUT" ves_measurement_publish_url: type: string - default: "http://10.0.11.1:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT" + default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT" + #default: "http://10.0.11.1:3904/events/unauthenticated.SEC_MEASUREMENT_OUTPUT" tag_version: type: string default: "{{ ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases }}/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.2.0" -- cgit 1.2.3-korg