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 f15b9a1..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
@@ -54,8 +54,8 @@ Feed.deleteHandling: SimulateDelete
 # Settings for Soutbound API: Postgresql
 #
 #####################################################
-# flag indieonapdemodbates if we are using postgresql
-UsePGSQL: true
+# flag indicates if we are using postgresql
+UsePGSQL: {{ .Values.PG.enabled  }}
 
 # postgres host name
 # Need to connect to PG primary service, designated by service.name2
@@ -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
+
 
 #####################################################
 #
@@ -108,7 +111,7 @@ MR.projectID:  mr
 #
 #####################################################
 # path to cadi.properties
-cadi.properties: /opt/app/osaaf/lcoal/org.onap.dmaap-bc.props
+cadi.properties: /opt/app/osaaf/local/org.onap.dmaap-bc.props
 
 #####################################################
 #
@@ -153,7 +156,7 @@ ApiNamespace: org.onap.dmaap-bc.api
 
 # If API authorization is required, then implement a class to enforce it.
 # This overrides the Class used for API permission check.
-#ApiPermission.Class: com.company.policy.DecisionPolicy
+ApiPermission.Class: org.onap.dmaap.dbcapi.authentication.AllowAll
 
 #####################################################
 #