X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fdmaap%2Fvalues.yaml;h=a077d183d5d4c8d029335507126ddc18bfaab9d2;hb=c4e11b8f1cd70737eb998618e7e000b25b742f85;hp=9a0bc34ce5787b40bd19e8658173f992a5dc45d5;hpb=d0a28353588232dfc241e7687c0f0140ca77b496;p=oom.git

diff --git a/kubernetes/dmaap/values.yaml b/kubernetes/dmaap/values.yaml
index 9a0bc34ce5..ecc5689668 100644
--- a/kubernetes/dmaap/values.yaml
+++ b/kubernetes/dmaap/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2018  AT&T Intellectual Property.  All rights reserved.
+# 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.
@@ -17,102 +18,42 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
+  nodePortPrefixExt: 304
   readinessRepository: oomk8s
-  readinessImage: readiness-check:1.1.0
+  readinessImage: readiness-check:2.0.0
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
-  postgresDatabase: dmaap
-  postgresUser: dmaap_admin
-  postgresPassword: onapdemodb
-  nsPrefix: onap
+  clientImage: onap/dmaap/dbc-client:1.0.9
+  repository: nexus3.onap.org:10001
+  busyBoxImage: busybox:1.30
+  busyBoxRepository: docker.io
 
+#Global DMaaP app config
+  allow_http: false
 
-#################################################################
-# Application configuration defaults.
-#################################################################
-#nsPrefix: onap
-pullPolicy: Always
-
-# application images
-repository: nexus3.onap.org:10001
-
-image:
-  buscontrollerImage: onap/dmaap/buscontroller
-  buscontrollerVersion: 1.0.2
+  #Logstash config
+  logstashServiceName: log-ls
+  logstashPort: 5044
 
+  #dmaap-dr-prov server configuration
+  dmaapDrProvName: dmaap-dr-prov
+  dmaapDrProvExtPort2: 443
+  dmaapDrProvExtPort: 80
 
-# application configuration
-# Example:
-config:
-#  username: myusername
-#  password: mypassword
-dmaapMessageRouterService: dmaap
-aafURL: https://onap-aaf:8905/proxy/
-topicMgrUser: m23456@dmaapbc.onap.org
-topicMgrPwd: onapdemo
-adminUser: m12345@dmaapbc.onap.org
-adminPwd: onapdemo
+  #AAF global config overrides
+  aafEnabled: true
+  aafAgentImage: onap/aaf/aaf_agent:2.1.15
+  aafAppNs: org.osaaf.aaf
+  aafLocatorContainer: oom
 
 
 
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
+#Component overrides
+message-router:
+  enabled: true
+dmaap-bc:
+  enabled: true
+dmaap-dr-node:
+  enabled: true
+dmaap-dr-prov:
   enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
-
-buscontroller:
-  service: prov-api
-  type: NodePort
-  name: buscontroller
-  httpExternalPort: 8080
-  httpsExternalPort: 8443
-  httpPort: 42
-  httpsPort: 43
-# default number of instances
-  replicas: 1
-# flag to enable debugging - application support required
-  debugEnabled: false
-
-service:
-  #Example service definition with external, internal and node ports.
-  #Services may use any combination of ports depending on the 'type' of
-  #service being defined.
-  type: NodePort
-  name: <onap-app>
-  externalPort: <8080>
-  internalPort: <80>
-  nodePort: <replace with unused node port suffix eg. 23>
-
-ingress:
-  enabled: false
-
-resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: 2
-#    memory: 4Gi
-#  requests:
-#    cpu: 2
-#    memory: 4Gi