summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--blueprints/k8s-helm.yaml2
-rw-r--r--blueprints/k8s-holmes-engine.yaml15
-rw-r--r--blueprints/k8s-holmes-rules.yaml8
-rw-r--r--blueprints/k8s-hv-ves.yaml5
-rw-r--r--blueprints/k8s-prh.yaml3
-rw-r--r--blueprints/k8s-snmptrap.yaml20
-rw-r--r--blueprints/k8s-tca-clampnode.yaml23
-rw-r--r--blueprints/k8s-tca.yaml23
-rw-r--r--blueprints/k8s-tcagen2.yaml2
9 files changed, 49 insertions, 52 deletions
diff --git a/blueprints/k8s-helm.yaml b/blueprints/k8s-helm.yaml
index 4aed5ba..6b69624 100644
--- a/blueprints/k8s-helm.yaml
+++ b/blueprints/k8s-helm.yaml
@@ -28,7 +28,7 @@ inputs:
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
+ default: 'https://nexus.onap.org/content/sites/oom-helm-staging'
chart-version :
description: Chart version for identified component-name
stable-repo-url:
diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml
index 707d2ed..0269018 100644
--- a/blueprints/k8s-holmes-engine.yaml
+++ b/blueprints/k8s-holmes-engine.yaml
@@ -26,26 +26,24 @@ imports:
inputs:
dcae_CL_publish_url:
type: string
- 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"
+ default: "http://message-router.onap:3904/events/unauthenticated.DCAE_CL_OUTPUT"
ves_fault_publish_url:
type: string
- 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"
+ default: "http://message-router.onap:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
msb_hostname:
type: string
- default: "msb-discovery.onap.svc.cluster.local"
+ default: "msb-iag.onap"
pgaas_cluster_name:
type: string
- default: "dcae-postgres.onap.svc.cluster.local"
+ default: "dcae-pg-primary.onap"
# use the single-VM PG instance
#default: pgvm
database_name:
type: string
- default: holmes
+ default: "holmes"
he_image:
type: string
- default: "nexus3.onap.org:10001/onap/holmes/engine-management:v1.0.0"
+ default: "nexus3.onap.org:10001/onap/holmes/engine-management:1.2.6"
node_templates:
pgaasvm:
@@ -99,3 +97,4 @@ node_templates:
relationships:
- type: cloudify.relationships.depends_on
target: pgaasvm
+
diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index 269692a..3b9880a 100644
--- a/blueprints/k8s-holmes-rules.yaml
+++ b/blueprints/k8s-holmes-rules.yaml
@@ -26,18 +26,18 @@ imports:
inputs:
msb_hostname:
type: string
- default: "msb-discovery.onap.svc.cluster.local"
+ default: "msb-iag.onap"
pgaas_cluster_name:
type: string
- default: "dcae-postgres.onap.svc.cluster.local"
+ default: "dcae-pg-primary.onap"
# use the single-VM PG instance
#default: pgvm
database_name:
type: string
- default: holmes
+ default: "holmes"
hr_image:
type: string
- default: "nexus3.onap.org:10001/onap/holmes/rule-management:v1.0.0"
+ default: "nexus3.onap.org:10001/onap/holmes/rule-management:1.2.7"
node_templates:
pgaasvm:
type: dcae.nodes.pgaas.database
diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index 383de51..a776159 100644
--- a/blueprints/k8s-hv-ves.yaml
+++ b/blueprints/k8s-hv-ves.yaml
@@ -78,6 +78,9 @@ inputs:
security_keys_trust_store_password_file:
type: string
default: '/etc/ves-hv/ssl/trust.pass'
+ use_tls:
+ type: boolean
+ default: true
node_templates:
hv-ves:
interfaces:
@@ -122,5 +125,5 @@ node_templates:
log_directory: { concat: [ '/var/log/ONAP/', { get_input: hv_ves_name } ] }
tls_info:
cert_directory: '/etc/ves-hv/ssl'
- use_tls: false
+ use_tls: { get_input: use_tls }
type: dcae.nodes.ContainerizedPlatformComponent
diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml
index 8fc8844..b7af288 100644
--- a/blueprints/k8s-prh.yaml
+++ b/blueprints/k8s-prh.yaml
@@ -32,7 +32,7 @@ inputs:
default: "https://aai.onap.svc.cluster.local:8443/aai/v12"
aaiEnrichmentHost:
type: string
- default: aai.onap.svc.cluster.local
+ default: "aai.onap.svc.cluster.local"
aaiEnrichmentPort:
type: integer
default: 8443
@@ -150,3 +150,4 @@ node_templates:
cert_directory: '/opt/app/prh/etc/cert'
use_tls: true
type: dcae.nodes.ContainerizedPlatformComponent
+
diff --git a/blueprints/k8s-snmptrap.yaml b/blueprints/k8s-snmptrap.yaml
index e1d50c7..5e9fc9f 100644
--- a/blueprints/k8s-snmptrap.yaml
+++ b/blueprints/k8s-snmptrap.yaml
@@ -25,15 +25,15 @@ imports:
inputs:
tag_version:
type: string
- default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0"
+ default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.snmptrap:2.0.3"
cache:
type: string
default:
- dns_cache_ttl_seconds: 60
+ "dns_cache_ttl_seconds: 60"
files:
type: string
default:
- arriving_traps_log: snmptrapd_arriving_traps.log
+ "arriving_traps_log: snmptrapd_arriving_traps.log
data_dir: data
eelf_audit: audit.log
eelf_base_dir: /opt/app/snmptrap/logs
@@ -47,32 +47,32 @@ inputs:
roll_frequency: day
runtime_base_dir: /opt/app/snmptrap
snmptrapd_diag: snmptrapd_prog_diag.log
- traps_stats_log: snmptrapd_stats.csv
+ traps_stats_log: snmptrapd_stats.csv"
protocols:
type: string
default:
- ipv4_interface: 0.0.0.0
+ "ipv4_interface: 0.0.0.0
ipv4_port: 6162
ipv6_interface: ::1
- ipv6_port: 6162
+ ipv6_port: 6162"
publisher:
type: string
default:
- http_milliseconds_between_retries: 750
+ "http_milliseconds_between_retries: 750
http_milliseconds_timeout: 1500
http_peer_publisher: unavailable
http_primary_publisher: 'true'
http_retries: 3
max_milliseconds_between_publishes: 10000
- max_traps_between_publishes: 10
+ max_traps_between_publishes: 10"
sec_fault_unsecure_topic:
type: string
default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP"
snmptrapd:
type: string
default:
- title: Collector for receiving SNMP traps and publishing to DMAAP/MR
- version: 1.4.0
+ "title: Collector for receiving SNMP traps and publishing to DMAAP/MR
+ version: 2.0.3"
external_port:
type: string
description: Kubernetes node port on which collector is exposed
diff --git a/blueprints/k8s-tca-clampnode.yaml b/blueprints/k8s-tca-clampnode.yaml
index 56dbc2c..4e3f218 100644
--- a/blueprints/k8s-tca-clampnode.yaml
+++ b/blueprints/k8s-tca-clampnode.yaml
@@ -34,25 +34,25 @@ inputs:
default: "8443"
enableAAIEnrichment:
type: string
- default: true
+ default: "true"
dmaap_host:
type: string
- default: message-router.onap
+ default: "message-router.onap.svc.cluster.local"
dmaap_port:
type: string
default: "3904"
enableRedisCaching:
type: string
- default: false
+ default: "false"
redisHosts:
type: string
- default: dcae-redis.onap.svc.cluster.local:6379
+ default: "dcae-redis.onap.svc.cluster.local:6379"
tag_version:
type: string
default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2"
consul_host:
type: string
- default: consul-server.onap
+ default: "consul-server.onap"
consul_port:
type: string
default: "8500"
@@ -147,22 +147,18 @@ node_templates:
envs:
DMAAPHOST:
{ get_input: dmaap_host }
- DMAAPPORT:
- { get_input: dmaap_port }
+ DMAAPPORT: "3904"
DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
AAIHOST:
{ get_input: aaiEnrichmentHost }
- AAIPORT:
- { get_input: aaiEnrichmentPort }
+ AAIPORT: "8443"
CONSUL_HOST:
{ get_input: consul_host }
- CONSUL_PORT:
- { get_input: consul_port }
+ CONSUL_PORT: "8500"
CBS_HOST:
{ get_input: cbs_host }
- CBS_PORT:
- { get_input: cbs_port }
+ CBS_PORT: "10000"
CONFIG_BINDING_SERVICE: "config_binding_service"
ports:
- concat: ["11011:", { get_input: external_port }]
@@ -173,3 +169,4 @@ node_templates:
get_input: policy_id
policy_model_id:
get_input: policy_model_id
+
diff --git a/blueprints/k8s-tca.yaml b/blueprints/k8s-tca.yaml
index f006531..94315b2 100644
--- a/blueprints/k8s-tca.yaml
+++ b/blueprints/k8s-tca.yaml
@@ -33,16 +33,16 @@ inputs:
default: "8443"
enableAAIEnrichment:
type: string
- default: true
+ default: "true"
dmaap_host:
type: string
- default: message-router.onap.svc.cluster.local
+ default: "message-router.onap.svc.cluster.local"
dmaap_port:
type: string
default: "3904"
enableRedisCaching:
type: string
- default: false
+ default: "false"
redisHosts:
type: string
default: dcae-redis.onap.svc.cluster.local:6379
@@ -51,13 +51,13 @@ inputs:
default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.2.2"
consul_host:
type: string
- default: consul-server.onap.svc.cluster.local
+ default: "consul-server.onap"
consul_port:
type: string
default: "8500"
cbs_host:
type: string
- default: "config-binding-service.dcae.svc.cluster.local"
+ default: "config-binding-service"
cbs_port:
type: string
default: "10000"
@@ -143,23 +143,20 @@ node_templates:
envs:
DMAAPHOST:
{ get_input: dmaap_host }
- DMAAPPORT:
- { get_input: dmaap_port }
+ DMAAPPORT: "3904"
DMAAPPUBTOPIC: "unauthenticated.DCAE_CL_OUTPUT"
DMAAPSUBTOPIC: "unauthenticated.VES_MEASUREMENT_OUTPUT"
AAIHOST:
{ get_input: aaiEnrichmentHost }
- AAIPORT:
- { get_input: aaiEnrichmentPort }
+ AAIPORT: "8443"
CONSUL_HOST:
{ get_input: consul_host }
- CONSUL_PORT:
- { get_input: consul_port }
+ CONSUL_PORT: "8500"
CBS_HOST:
{ get_input: cbs_host }
- CBS_PORT:
- { get_input: cbs_port }
+ CBS_PORT: "10000"
CONFIG_BINDING_SERVICE: "config_binding_service"
ports:
- concat: ["11011:", "0"]
+
diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml
index 7b8b5d6..9cef884 100644
--- a/blueprints/k8s-tcagen2.yaml
+++ b/blueprints/k8s-tcagen2.yaml
@@ -122,4 +122,4 @@ node_templates:
dns_name: { get_input: service_name }
replicas:
get_input: replicas
-
+ name: { get_input: service_name }