From ce0f3b66fb6597d1f2da4159d2d14d066a54cb84 Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Wed, 31 Oct 2018 22:02:50 +0000 Subject: [PATCH] Use fixed namespace for topics in Casablanca Change-Id: I19928cb9ad91e4281ce894191d2813243cf49c2b Signed-off-by: dglFromAtt Issue-ID: OOM-1491 --- .../dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json | 4 ++++ kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json index 27411c64d2..9099e046ed 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json @@ -1,5 +1,9 @@ { +{{ if eq .Values.fixedTopicNamespace true }} + "dmaapName": "mr", +{{- else -}} "dmaapName": "{{ include "common.namespace" . }}", +{{- end}} "drProvUrl": "https://dmaap-dr-prov:8443", "version": "1", "topicNsRoot": "org.onap.dmaap", diff --git a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml index 2f6bef8059..0483ce5db2 100644 --- a/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml +++ b/kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml @@ -42,6 +42,11 @@ topicMgrPwd: demo123456! adminUser: aaf_admin@people.osaaf.org adminPwd: demo123456! +# for Casablanca default deployment, leave this true to +# get a topic namespace that matches MR. When set to false, +# it will compose the topic namespace using the kubernetes namespace value +fixedTopicNamespace: true + nodeSelector: {} affinity: {} -- 2.16.6