Merge "Set aai-resources version 1.3.1"

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 27411c6..9099e04 100644 (file)
--- 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 2f6bef8..0483ce5 100644 (file)
--- 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: {}

diff --git a/kubernetes/robot/demo-k8s.sh b/kubernetes/robot/demo-k8s.sh
index 971c0c4..8f74139 100755 (executable)
--- a/kubernetes/robot/demo-k8s.sh
+++ b/kubernetes/robot/demo-k8s.sh
@@ -166,6 +166,10 @@ do
                        TAG="cds"
                        shift
                        ;;
+        distributeVFWNG)
+                        TAG="distributeVFWNG"
+                        shift
+                        ;;
        *)
                        usage
                        exit