Merge "Revert "basic auth for so-monitoring""

[oom.git] / kubernetes / dmaap / components / dmaap-bc / resources / config / dmaapbc.properties

diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
index dc9298d..e43182d 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
+++ b/kubernetes/dmaap/components/dmaap-bc/resources/config/dmaapbc.properties
@@ -25,7 +25,7 @@
 #
 #####################################################
 # Indicator for whether to use AAF
-UseAAF: true
+UseAAF: {{ .Values.global.aafEnabled }}
 
 # csit: stubs out some southbound APIs for csit
 csit: No
@@ -101,6 +101,9 @@ MR.TopicMgrRole: org.onap.dmaap-bc-topic-mgr.client
 # MR topic ProjectID (used in certain topic name generation formats)
 MR.projectID:  mr
 
+# Use Basic Authentication when provisioning topics
+MR.authentication: basicAuth
+
 
 #####################################################
 #