X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdcaegen2%2Fcharts%2Fdcae-bootstrap%2Fvalues.yaml;h=9c45b9f62cc5e654debc37b3fef18e6b2eb060c6;hb=90be7125288e76e5a1e657b126aa56be7e3731f6;hp=fc89c6c459211287eb57fdfa5ac42f993e1abe70;hpb=b2e4ea650381d9e109c23a9fe51980655500fb29;p=oom.git

diff --git a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
index fc89c6c459..9c45b9f62c 100644
--- a/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
+++ b/kubernetes/dcaegen2/charts/dcae-bootstrap/values.yaml
@@ -1,7 +1,7 @@
 #============LICENSE_START========================================================
 #=================================================================================
 # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
-# Copyright © 2018 Amdocs, Bell Canada
+# Modifications Copyright © 2018 Amdocs, Bell Canada
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,9 +21,8 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiZGNhZUBkY2FlLm9uYXAub3JnIiwiYXV0aCI6IlpHOWphMlZ5T21SdlkydGxjZz09In19
   readinessRepository: oomk8s
-  readinessImage: readiness-check:1.1.0
+  readinessImage: readiness-check:2.0.0
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
 
@@ -36,31 +35,73 @@ config:
       host: consul-server
       port: 8500
     cm: dcae-cloudify-manager
+    dmaap_dr_prov: dmaap-dr-prov
     message_router: message-router
     msb_discovery: msb-discovery
     policy_pdp: pdp
     sdc: sdc-be
+  # redisCaching is a string not a boolean!
+  redisCaching: "false"
 
+# postgres values--overriding defaults in the postgres subchart
+postgres:
+  nameOverride: dcae-db
+  service:
+    name: dcae-postgres
+    name2: dcae-pg-primary
+    name3: dcae-pg-replica
+  container:
+    name:
+      primary: dcae-pg-primary
+      replica: dcae-pg-replica
+  config:
+    pgPrimaryPassword: onapdemodb
+    pgRootPassword: onapdemodb
+  persistence:
+    mountSubPath: dcae/data
+    mountInitPath: dcae
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.1.5
+image: onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container:1.4.2
 
 # DCAE component images to be deployed via Cloudify Manager
 # Use to override default setting in blueprints
 componentImages:
-  #TODO for further investigation: input template expansion issues if we comment this out
-  config_binding_service: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.configbinding:2.1.4
-#  deployment_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.deployment-handler:2.1.1
-#  holmes_engine: nexus3.onap.org:10001//onap/holmes/engine-management:v1.0.0
-#  holmes_rules: nexus3.onap.org:10001/onap/holmes/rule-management:v1.0.0
-  inventory: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.inventory-api:3.0.1
-  policy_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.policy-handler:2.4.1
-  service_change_handler: nexus3.onap.org:10001/onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.3
-#  tca: nexus3.onap.org:10001/onap/org.onap.dcaegen2.deployments.tca-cdap-container.tca-cdap-container:1.0.0
-#  ves: nexus3.onap.org:10001/onap/org.onap.dcaegen2.collectors.ves.vescollector:1.1-latest
+  config_binding_service: onap/org.onap.dcaegen2.platform.configbinding.app-app:2.2.3
+  datafile_collector: onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server:latest
+  deployment_handler: onap/org.onap.dcaegen2.platform.deployment-handler:3.0.2
+  holmes_rules: onap/holmes/rule-management:1.2.0-STAGING-latest
+  holmes_engine: onap/holmes/engine-management:1.2.0-STAGING-latest
+  inventory: onap/org.onap.dcaegen2.platform.inventory-api:3.0.4
+  policy_handler: onap/org.onap.dcaegen2.platform.policy-handler:4.4.0
+  service_change_handler: onap/org.onap.dcaegen2.platform.servicechange-handler:1.1.5
+  tca: onap/org.onap.dcaegen2.deployments.tca-cdap-container:1.1.0
+  ves: onap/org.onap.dcaegen2.collectors.ves.vescollector:1.3.1
+  snmptrap: onap/org.onap.dcaegen2.collectors.snmptrap:1.4.0
+  prh: onap/org.onap.dcaegen2.services.prh.prh-app-server:1.0.0
+  hv_ves: onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main:1.0.0-SNAPSHOT
 
+# Resource Limit flavor -By Default using small
+flavor: small
+# Segregation for Different environment (Small and Large)
+resources:
+  small:
+    limits:
+      cpu: 2
+      memory: 2Gi
+    requests:
+      cpu: 1
+      memory: 1Gi
+  large:
+    limits:
+      cpu: 4
+      memory: 4Gi
+    requests:
+      cpu: 2
+      memory: 2Gi
+  unlimited: {}
 # Kubernetes namespace for components deployed via Cloudify manager
 # If empty, use the common namespace
-dcae_ns: "dcae"
+# dcae_ns: "onap"