Merge "[CPS] New Delhi release changes"

[oom.git] / kubernetes / msb / values.yaml

diff --git a/kubernetes/msb/values.yaml b/kubernetes/msb/values.yaml
index d6c12ea..4f1b659 100644 (file)
--- a/kubernetes/msb/values.yaml
+++ b/kubernetes/msb/values.yaml
@@ -1,31 +1,33 @@
-nsPrefix: onap
-pullPolicy: IfNotPresent
-image:
-  readiness: oomk8s/readiness-check:1.1.0
-  consul: consul:0.9.3
-  discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.1.0-SNAPSHOT-latest
-  apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.1.0-SNAPSHOT-latest
-  kube2msb: nexus3.onap.org:10001/onap/oom/kube2msb
+# Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018  ZTE
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-consulPort: 8500
-consulNodePort: 30500
-msbConsulReplicas: 1
+#################################################################
+# Global configuration defaults.
+#################################################################
+global:
+  nodePortPrefix: 302
+  centralizedLoggingEnabled: true
 
-discoveryPort: 10081
-discoveryNodePort: 30081
-discoveryReplicas: 1
+# application configuration
+config:
+  logstashServiceName: log-ls
+  logstashPort: 5044
 
-iagPort: 80
-iagPort_https: 443
-iagNodePort: 30080
-iagNodePort_https: 30443
-iagReplicas: 2
-
-eagPort: 80
-eagPort_https: 443
-eagNodePort: 30082
-eagNodePort_https: 30446
-eagReplicas: 2
-
-kubeMasterUrl: https://kubernetes.default.svc.cluster.local:443
-discoveryUrl: http://msb-discovery.{{ .Values.nsPrefix }}:10081
+msb-discovery:
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-msb'
+msb-eag:
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-msb'
+msb-iag:
+  logConfigMapNamePrefix: '{{ include "common.release" . }}-msb'