diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-11-01 19:24:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-01 19:24:21 +0000 |
| commit | 5921ff91b056676cf9f77f94b9d8d86ff4e836b2 (patch) | |
| tree | 5b2020861e8e1c65ca24e70126221068a2a9bff9 | |
| parent | 3424d414e6b3d1252d54d44a49138f8c955aab2a (diff) | |
| parent | ce0f3b66fb6597d1f2da4159d2d14d066a54cb84 (diff) | |
Merge "Use fixed namespace for topics in Casablanca"
| -rw-r--r-- | kubernetes/dmaap/charts/dmaap-bus-controller/resources/dmaap/onap.json | 4 | ||||
| -rw-r--r-- | kubernetes/dmaap/charts/dmaap-bus-controller/values.yaml | 5 |
2 files changed, 9 insertions, 0 deletions
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: {} |